Skip to content

Commit 35d203c

Browse files
committed
Address PR feedback
1 parent 92702c2 commit 35d203c

File tree

7 files changed

+4
-136
lines changed

7 files changed

+4
-136
lines changed

src/CodeStyle/Core/CodeFixes/Host/Mef/CodeStyleHostLanguageServices.MefHostExportProvider.cs

Lines changed: 0 additions & 70 deletions
This file was deleted.

src/CodeStyle/Core/CodeFixes/Host/Mef/CodeStyleHostLanguageServices.cs

Lines changed: 0 additions & 46 deletions
This file was deleted.

src/Features/Core/Portable/RemoveUnnecessaryImports/AbstractRemoveUnnecessaryImportsDiagnosticAnalyzer.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,7 @@ private void AnalyzeSemanticModel(SemanticModelAnalysisContext context)
154154
static bool ShouldFade(AnalyzerOptions options, SyntaxTree tree, string language, CancellationToken cancellationToken)
155155
{
156156
var optionSet = options.GetOptions(tree, cancellationToken);
157-
if (optionSet == null)
158-
{
159-
return false;
160-
}
161-
162-
return optionSet.GetOption(FadingOptions.FadeOutUnusedImports, language);
163-
157+
return optionSet != null && optionSet.GetOption(FadingOptions.FadeOutUnusedImports, language);
164158
}
165159
}
166160

src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/BatchFixAllProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Microsoft.CodeAnalysis.CodeFixes
2525
/// </summary>
2626
internal partial class BatchFixAllProvider : FixAllProvider
2727
{
28-
public static readonly BatchFixAllProvider Instance = new BatchFixAllProvider();
28+
public static readonly FixAllProvider Instance = new BatchFixAllProvider();
2929

3030
protected BatchFixAllProvider() { }
3131

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
<PropertyGroup Label="Configuration">
99
<Import_RootNamespace>Microsoft.CodeAnalysis.Shared</Import_RootNamespace>
1010
</PropertyGroup>
11-
<ItemGroup>
12-
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
13-
</ItemGroup>
1411
<ItemGroup>
1512
<Compile Include="$(MSBuildThisFileDirectory)..\..\..\..\Compilers\Core\Portable\InternalUtilities\Debug.cs" Link="InternalUtilities\Debug.cs" />
1613
<Compile Include="$(MSBuildThisFileDirectory)..\..\..\..\Compilers\Core\Portable\InternalUtilities\EnumerableExtensions.cs" Link="InternalUtilities\EnumerableExtensions.cs" />

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/VisualBasicCompilerExtensions.projitems

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,4 @@
1414
<Compile Include="$(MSBuildThisFileDirectory)Extensions\SyntaxTriviaExtensions.vb" />
1515
<Compile Include="$(MSBuildThisFileDirectory)Helpers\RemoveUnnecessaryImports\VisualBasicUnnecessaryImportsProvider.vb" />
1616
</ItemGroup>
17-
<ItemGroup>
18-
<Import Include="Microsoft.CodeAnalysis.Shared.Extensions" />
19-
<Import Include="Microsoft.CodeAnalysis.Shared.Utilities" />
20-
<Import Include="Microsoft.CodeAnalysis.VisualBasic" />
21-
<Import Include="Microsoft.CodeAnalysis.VisualBasic.Extensions" />
22-
<Import Include="Roslyn.Utilities" />
23-
<Import Include="Roslyn.Utilities.Contract" />
24-
</ItemGroup>
2517
</Project>

src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/Extensions/HostWorkspaceServicesExtensions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public static HostLanguageServices GetExtendedLanguageServices(this HostWorkspac
2323
var languageServices = hostWorkspaceServices.GetLanguageServices(languageName);
2424

2525
#if CODE_STYLE
26-
languageServices = CodeStyleHostLanguageServices.GetRequiredMappedCodeStyleLanguageServices(languageServices);
26+
// TODO: Uncomment the below once we enable language service detection in CodeStyle layer.
27+
//languageServices = CodeStyleHostLanguageServices.GetRequiredMappedCodeStyleLanguageServices(languageServices);
2728
#endif
2829
return languageServices;
2930
}

0 commit comments

Comments
 (0)