diff --git a/src/Analyzers/VisualBasic/Tests/RemoveUnnecessaryImports/RemoveUnnecessaryImportsTests.vb b/src/Analyzers/VisualBasic/Tests/RemoveUnnecessaryImports/RemoveUnnecessaryImportsTests.vb index 0bd73a1d47c6ea10afc1068f12557c1f41be3f38..62f0af60e500927145919ba89d8fdd4b3460d840 100644 --- a/src/Analyzers/VisualBasic/Tests/RemoveUnnecessaryImports/RemoveUnnecessaryImportsTests.vb +++ b/src/Analyzers/VisualBasic/Tests/RemoveUnnecessaryImports/RemoveUnnecessaryImportsTests.vb @@ -45,7 +45,7 @@ End Module|]") Public Async Function TestNoImports() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports System Imports System.Collections.Generic Imports System.Linq @@ -61,7 +61,7 @@ End Module") Public Async Function TestNoImportsWithCopyright() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|' Copyright (c) Somebody. Imports System @@ -83,7 +83,7 @@ End Module") Public Async Function TestReferencesWithCopyrightAndGroupings() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|' Copyright (c) Somebody. Imports System.Collections.Generic @@ -111,7 +111,7 @@ End Module") Public Async Function TestReferencesWithCopyrightAndPreservableTrivia() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|' Copyright (c) Somebody. Imports System.Collections.Generic @@ -140,7 +140,7 @@ End Module") Public Async Function TestSimpleTypeName() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports System Imports System.Collections.Generic Imports System.Linq @@ -159,7 +159,7 @@ End Module") Public Async Function TestGenericTypeName() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports System Imports System.Collections.Generic Imports System.Linq @@ -178,7 +178,7 @@ End Module") Public Async Function TestNamespaceName() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports System Imports System.Collections.Generic Imports System.Linq @@ -197,7 +197,7 @@ End Module") Public Async Function TestAliasName() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports System Imports System.Collections.Generic Imports System.Linq @@ -217,7 +217,7 @@ End Module") Public Async Function TestExtensionMethod() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports System Imports System.Collections.Generic Imports System.Linq @@ -236,7 +236,7 @@ End Module") Public Async Function TestModuleMember() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports System Imports System.Collections.Generic Imports System.Linq @@ -268,7 +268,7 @@ End Module") Public Async Function TestInvalidCodeRemovesImports() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports System Imports System.Collections.Generic Module Program @@ -288,7 +288,7 @@ End Module") Public Async Function TestExcludedCodeIsIgnored() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports System Module Program Sub Main() @@ -309,7 +309,7 @@ End Module") Public Async Function TestCommentsAroundImportsStatement() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( 'c1 [|Imports System.Configuration 'c2 Imports System, System.Collections.Generic 'c3 @@ -373,7 +373,7 @@ End Class|]") Public Async Function TestImportsSurroundedByDirectives() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "#If True Then [|Imports System.Collections.Generic #End If @@ -388,7 +388,7 @@ End Module") Public Async Function TestRemovingUnbindableImports() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports gibberish Module Program End Module|]", @@ -399,7 +399,7 @@ End Module") Public Async Function TestPreservePrecedingComments() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( ' c1 [|Imports System 'c2 ' C3 @@ -416,7 +416,7 @@ End Module.NormalizedValue) Public Async Function TestDirective1() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( #If True Then [|Imports System.Collections.Generic #End If @@ -433,7 +433,7 @@ End Module.NormalizedValue) Public Async Function TestDirective2() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( #If True Then [|Imports System Imports System.Collections.Generic @@ -454,7 +454,7 @@ End Module.NormalizedValue) Public Async Function TestImportsClauseRemoval1() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports System, goo, System.Collections.Generic Module Program Sub Main(args As String()) @@ -482,7 +482,7 @@ End Namespace") Public Async Function TestImportsClauseRemoval2() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports System, System.Collections.Generic, goo Module Program Sub Main(args As String()) @@ -509,7 +509,7 @@ End Namespace") Public Async Function TestImportsClauseRemoval3() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports goo, System, System.Collections.Generic Module Program Sub Main(args As String()) @@ -537,7 +537,7 @@ End Namespace") Public Async Function TestUnbindableNamespace() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports gibberish Module Program End Module|]", @@ -548,7 +548,7 @@ End Module") Public Async Function TestRemoveClause() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports System, goo, System.Collections.Generic Module Program Sub Main(args As String()) @@ -576,7 +576,7 @@ End Namespace") Public Async Function TestRemoveClauseWithExplicitLC1() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports A _ , B Module Program @@ -610,7 +610,7 @@ End Namespace") Public Async Function TestRemoveClauseWithExplicitLC2() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports B _ , A Module Program @@ -645,7 +645,7 @@ End Namespace") Public Async Function TestRemoveClauseWithExplicitLC3() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( [|Imports A _ , B _ , C @@ -698,7 +698,7 @@ End Namespace.NormalizedValue) Public Async Function TestTypeImports() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( [|Imports Goo Module Program @@ -743,7 +743,7 @@ End Class|].NormalizedValue) Public Async Function TestAlias() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( [|Imports F = SomeNS Module Program @@ -787,7 +787,7 @@ End Namespace|].NormalizedValue) Public Async Function TestImportsOnSameLine1() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( [|Imports A : Imports B Module Program @@ -826,7 +826,7 @@ End Namespace.NormalizedValue) Public Async Function TestImportsOnSameLine2() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( [|Imports A : Imports B Imports C @@ -910,7 +910,7 @@ End Class|]") 'TODO (tomat): modules not yet supported in script Public Async Function TestUnusedTypeImportIsRemoved() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( [|Imports SomeNS.Goo Module Program @@ -1012,7 +1012,7 @@ End Class|].NormalizedValue) Public Async Function TestRemoveSuperfluousNewLines1() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( [|Imports System Imports System.Collections.Generic Imports System.Linq @@ -1032,7 +1032,7 @@ End Module.NormalizedValue) Public Async Function TestRemoveSuperfluousNewLines2() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( .NormalizedValue) Public Async Function TestRegressionFor10326() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( "[|Imports System.ComponentModel Class Category @@ -1108,7 +1108,7 @@ diagnosticId:=IDEDiagnosticIds.RemoveUnnecessaryImportsDiagnosticId) Public Async Function TestRemovalSpan4() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async( #Const A = 1 Imports System @@ -1125,7 +1125,7 @@ Class C : Dim x As Action : End Class.NormalizedValue) Public Async Function TestImplicitElementAtOrDefault() As Task - Await TestInRegularAndScriptAsync( + Await TestInRegularAndScript1Async(