Skip to content

Commit 92e6d6a

Browse files
majochaKevinRansom
authored andcommitted
remove FSharp.LanguageService.Base dependency (#4588)
* extract PatternMatcher to separate project * add project reference
1 parent 08bfa00 commit 92e6d6a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+46
-11
lines changed

VisualFSharp.sln

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Build.UnitTests", "t
138138
EndProject
139139
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PEVerify", "tests\fsharpqa\testenv\src\PEVerify\PEVerify.csproj", "{B0689A4E-07D8-494D-A0C8-791CB1D74E54}"
140140
EndProject
141+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PatternMatcher", "vsintegration\src\PatternMatcher\PatternMatcher.csproj", "{18227628-DF90-4C47-AF3D-CC72D2EDD986}"
142+
EndProject
141143
Global
142144
GlobalSection(SolutionConfigurationPlatforms) = preSolution
143145
Debug|Any CPU = Debug|Any CPU
@@ -554,6 +556,14 @@ Global
554556
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|Any CPU.Build.0 = Release|Any CPU
555557
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|x86.ActiveCfg = Release|Any CPU
556558
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|x86.Build.0 = Release|Any CPU
559+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
560+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Debug|Any CPU.Build.0 = Debug|Any CPU
561+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Debug|x86.ActiveCfg = Debug|Any CPU
562+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Debug|x86.Build.0 = Debug|Any CPU
563+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|Any CPU.ActiveCfg = Release|Any CPU
564+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|Any CPU.Build.0 = Release|Any CPU
565+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|x86.ActiveCfg = Release|Any CPU
566+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|x86.Build.0 = Release|Any CPU
557567
EndGlobalSection
558568
GlobalSection(SolutionProperties) = preSolution
559569
HideSolutionNode = FALSE
@@ -617,6 +627,7 @@ Global
617627
{0385564F-07B4-4264-AB8A-17C393E9140C} = {F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
618628
{400FAB03-786E-40CC-85A8-04B0C2869B14} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
619629
{B0689A4E-07D8-494D-A0C8-791CB1D74E54} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
630+
{18227628-DF90-4C47-AF3D-CC72D2EDD986} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
620631
EndGlobalSection
621632
GlobalSection(ExtensibilityGlobals) = postSolution
622633
SolutionGuid = {48EDBBBE-C8EE-4E3C-8B19-97184A487B37}

vsintegration/src/FSharp.Editor/Commands/HelpContextService.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ open System.Collections.Generic
77
open System.Composition
88
open Microsoft.CodeAnalysis.Text
99
open Microsoft.CodeAnalysis.Classification
10-
open Microsoft.VisualStudio.FSharp.LanguageService
1110
open Microsoft.VisualStudio.LanguageServices.Implementation.F1Help
1211
open Microsoft.CodeAnalysis.Host.Mef
1312
open Microsoft.FSharp.Compiler

vsintegration/src/FSharp.Editor/Commands/XmlDocCommandService.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ open Microsoft.VisualStudio.TextManager.Interop
1515
open Microsoft.VisualStudio.Utilities
1616
open Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem
1717
open Microsoft.FSharp.Compiler.SourceCodeServices
18-
open Microsoft.VisualStudio.FSharp.LanguageService
1918

2019
type internal XmlDocCommandFilter
2120
(

vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ open Microsoft.FSharp.Compiler
1414
open Microsoft.FSharp.Compiler.Layout
1515
open Microsoft.FSharp.Compiler.SourceCodeServices
1616
open Microsoft.FSharp.Compiler.Range
17-
open Microsoft.VisualStudio.FSharp.LanguageService
1817

1918
[<RequireQualifiedAccess>]
2019
module internal RoslynHelpers =

vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ open Microsoft.CodeAnalysis.Completion
1414
open Microsoft.CodeAnalysis.Options
1515
open Microsoft.CodeAnalysis.Text
1616

17-
open Microsoft.VisualStudio.FSharp.LanguageService
1817
open Microsoft.VisualStudio.Shell
1918
open Microsoft.VisualStudio.Shell.Interop
2019

vsintegration/src/FSharp.Editor/Diagnostics/ProjectDiagnosticAnalyzer.fs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ open Microsoft.FSharp.Compiler
1919
open Microsoft.FSharp.Compiler.SourceCodeServices
2020
open Microsoft.FSharp.Compiler.Range
2121

22-
open Microsoft.VisualStudio.FSharp.LanguageService
23-
2422
#if PROJECT_ANALYSIS
2523
// Project-wide error analysis. We don't enable this because ParseAndCheckProject checks projects against the versions of the files
2624
// saves to the file system. This is different to the versions of the files active in the editor. This results in out-of-sync error

vsintegration/src/FSharp.Editor/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ open Microsoft.FSharp.Compiler
1515
open Microsoft.FSharp.Compiler.Range
1616
open Microsoft.FSharp.Compiler.SourceCodeServices
1717

18-
open Microsoft.VisualStudio.FSharp.LanguageService
19-
2018
type private TextVersionHash = int
2119

2220
[<DiagnosticAnalyzer(FSharpConstants.FSharpLanguageName)>]

vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@
9696
<ItemGroup>
9797
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
9898
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
99-
<ProjectReference Include="..\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj" />
10099
<ProjectReference Include="..\FSharp.UIResources\FSharp.UIResources.csproj" />
101100
<ProjectReference Include="..\FSharp.VS.FSI\FSharp.VS.FSI.fsproj" />
101+
<ProjectReference Include="..\PatternMatcher\PatternMatcher.csproj" />
102102
</ItemGroup>
103103

104104
<ItemGroup>

vsintegration/src/FSharp.Editor/LanguageService/Symbols.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ open Microsoft.CodeAnalysis
1111
open Microsoft.CodeAnalysis.Classification
1212
open Microsoft.CodeAnalysis.Text
1313

14-
open Microsoft.VisualStudio.FSharp.LanguageService
1514
open Microsoft.FSharp.Compiler
1615
open Microsoft.FSharp.Compiler.Ast
1716
open Microsoft.FSharp.Compiler.SourceCodeServices

vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ open Microsoft.CodeAnalysis
1111
open Microsoft.CodeAnalysis.Classification
1212
open Microsoft.CodeAnalysis.Text
1313

14-
open Microsoft.VisualStudio.FSharp.LanguageService
1514
open Microsoft.FSharp.Compiler
1615
open Microsoft.FSharp.Compiler.Ast
1716
open Microsoft.FSharp.Compiler.SourceCodeServices

0 commit comments

Comments
 (0)