Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7b9e2d9

Browse files
TIHanbrettfo
authored andcommitted
Removing cps stamp as we don't need it
1 parentd6bfcfe commit7b9e2d9

File tree

1 file changed

+17
-24
lines changed

1 file changed

+17
-24
lines changed

‎vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,15 @@ open System.Threading
2222
openMicrosoft.VisualStudio.Shell.Interop
2323
openMicrosoft.VisualStudio.LanguageServices.Implementation.TaskList
2424

25-
typeprivateCpsStamp= DateTime
26-
2725
[<AutoOpen>]
2826
moduleprivateFSharpProjectOptionsHelpers=
2927

30-
letmapCpsProjectToSite(workspace:VisualStudioWorkspaceImpl,project:Project,serviceProvider:System.IServiceProvider,cpsCommandLineOptions:IDictionary<ProjectId,CpsStamp*string[]*string[]>)=
28+
letmapCpsProjectToSite(workspace:VisualStudioWorkspaceImpl,project:Project,serviceProvider:System.IServiceProvider,cpsCommandLineOptions:IDictionary<ProjectId,string[]*string[]>)=
3129
lethier= workspace.GetHierarchy(project.Id)
32-
letcpsStampOpt,sourcePaths,referencePaths,options=
30+
letsourcePaths,referencePaths,options=
3331
match cpsCommandLineOptions.TryGetValue(project.Id)with
34-
|true,(cpsStamp, sourcePaths, options)-> Some(cpsStamp), sourcePaths,[||], options
35-
|false,_-> None,[||],[||],[||]
36-
cpsStampOpt,
32+
|true,(sourcePaths, options)-> sourcePaths,[||], options
33+
|false,_->[||],[||],[||]
3734
{
3835
new IProvideProjectSitewith
3936
memberx.GetProjectSite()=
@@ -94,9 +91,9 @@ type private FSharpProjectOptionsReactor (workspace: VisualStudioWorkspaceImpl,
9491
letcancellationTokenSource=new CancellationTokenSource()
9592

9693
// Hack to store command line options from HandleCommandLineChanges
97-
letcpsCommandLineOptions=new ConcurrentDictionary<ProjectId,DateTime*string[]* string[]>()
94+
letcpsCommandLineOptions=new ConcurrentDictionary<ProjectId, string[]* string[]>()
9895

99-
letcache= Dictionary<ProjectId,CpsStamp option*VersionStamp* FSharpParsingOptions* FSharpProjectOptions>()
96+
letcache= Dictionary<ProjectId, VersionStamp* FSharpParsingOptions* FSharpProjectOptions>()
10097

10198
let rectryComputeOptions(project:Project)=
10299
letprojectId= project.Id
@@ -133,14 +130,14 @@ type private FSharpProjectOptionsReactor (workspace: VisualStudioWorkspaceImpl,
133130
else
134131

135132
lethier= workspace.GetHierarchy(projectId)
136-
letcpsStampOpt,projectSite=
133+
letprojectSite=
137134
match hierwith
138135
// Legacy
139-
|(:? IProvideProjectSiteas provideSite)->None,provideSite.GetProjectSite()
136+
|(:? IProvideProjectSiteas provideSite)-> provideSite.GetProjectSite()
140137
// Cps
141138
|_->
142-
letcpsStampOpt,provideSite= mapCpsProjectToSite(workspace, project, serviceProvider, cpsCommandLineOptions)
143-
cpsStampOpt,provideSite.GetProjectSite()
139+
letprovideSite= mapCpsProjectToSite(workspace, project, serviceProvider, cpsCommandLineOptions)
140+
provideSite.GetProjectSite()
144141

145142
letotherOptions=
146143
project.ProjectReferences
@@ -182,16 +179,12 @@ type private FSharpProjectOptionsReactor (workspace: VisualStudioWorkspaceImpl,
182179

183180
letparsingOptions,_= checkerProvider.Checker.GetParsingOptionsFromProjectOptions(projectOptions)
184181

185-
cache.[projectId]<-(cpsStampOpt,projectStamp, parsingOptions, projectOptions)
182+
cache.[projectId]<-(projectStamp, parsingOptions, projectOptions)
186183

187184
Some(parsingOptions, projectOptions)
188185

189-
|true,(cpsStampOpt, projectStamp2, parsingOptions, projectOptions)->
190-
letcpsStampOpt2=
191-
match cpsCommandLineOptions.TryGetValue(projectId)with
192-
|true,(cpsStampOpt2,_,_)-> Some(cpsStampOpt2)
193-
|_-> None
194-
if projectStamp<> projectStamp2|| cpsStampOpt<> cpsStampOpt2then
186+
|true,(projectStamp2, parsingOptions, projectOptions)->
187+
if projectStamp<> projectStamp2then
195188
cache.Remove(projectId)|> ignore
196189
tryComputeOptions project
197190
else
@@ -219,8 +212,8 @@ type private FSharpProjectOptionsReactor (workspace: VisualStudioWorkspaceImpl,
219212
member__.ClearOptionsByProjectId(projectId)=
220213
agent.Post(FSharpProjectOptionsMessage.ClearOptions(projectId))
221214

222-
member__.SetCpsCommandLineOptions(projectId,stamp,sourcePaths,options)=
223-
cpsCommandLineOptions.[projectId]<-(stamp,sourcePaths, options)
215+
member__.SetCpsCommandLineOptions(projectId,sourcePaths,options)=
216+
cpsCommandLineOptions.[projectId]<-(sourcePaths, options)
224217

225218
member__.TryGetCachedOptionsByProjectId(projectId)=
226219
match cache.TryGetValue(projectId)with
@@ -302,7 +295,7 @@ type internal FSharpProjectOptionsManager
302295
memberthis.GetCompilationDefinesForEditingDocument(document:Document)=
303296
letparsingOptions=
304297
match reactor.TryGetCachedOptionsByProjectId(document.Project.Id)with
305-
| Some(_,_,parsingOptions,_)-> parsingOptions
298+
| Some(_, parsingOptions,_)-> parsingOptions
306299
|_->{ FSharpParsingOptions.Defaultwith IsInteractive= IsScript document.Name}
307300
CompilerEnvironment.GetCompilationDefinesForEditing parsingOptions
308301

@@ -370,6 +363,6 @@ type internal FSharpProjectOptionsManager
370363
else Path.Combine(Path.GetDirectoryName(path), p)
371364
letsourcePaths= sources|> Seq.map(fun s-> fullPath s.Path)|> Seq.toArray
372365

373-
reactor.SetCpsCommandLineOptions(projectId,DateTime.UtcNow,sourcePaths, options.ToArray())
366+
reactor.SetCpsCommandLineOptions(projectId, sourcePaths, options.ToArray())
374367

375368
member__.Checker= checkerProvider.Checker

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp