Commit17d153e

Vasily Kirichenko

authored and

Vasily Kirichenko

committed

remove CancellationToken from repeatedlyProgressUntilDoneOrTimeShareOver(OrCanceled)

remove explicit CancellationToken from forceAsync

1 parentfd99c76 commit17d153eCopy full SHA for 17d153e

File tree

3 files changed

-19

lines changed

src
- absil
  - illib.fs
- fsharp/vs
  - IncrementalBuild.fs
  - service.fs

3 files changed

-19

lines changed

`‎src/absil/illib.fs‎`

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ module Eventually =`
`521`	`521`
`522`	`522`	`/// Keep running the computation bit by bit until a time limit is reached.`
`523`	`523`	`/// The runner gets called each time the computation is restarted`
`524`		`-letrepeatedlyProgressUntilDoneOrTimeShareOverOrCanceled timeShareInMilliseconds(cancellationToken:CancellationToken)runner e=`
	`524`	`+letrepeatedlyProgressUntilDoneOrTimeShareOver timeShareInMilliseconds runner e=`
`525`	`525`	`letsw=new System.Diagnostics.Stopwatch()`
`526`	`526`	`let recrunTimeShare e=`
`527`	`527`	`runner(fun()->`
`@@ -531,24 +531,22 @@ module Eventually =`
`531`	`531`	`match ewith`
`532`	`532`	`\| Done_-> e`
`533`	`533`	`\| NotYetDone work->`
`534`		`-ifcancellationToken.IsCancellationRequested\|\|sw.ElapsedMilliseconds> timeShareInMillisecondsthen`
	`534`	`+if sw.ElapsedMilliseconds> timeShareInMillisecondsthen`
`535`	`535`	`sw.Stop();`
`536`	`536`	`NotYetDone(fun()-> runTimeShare e)`
`537`	`537`	`else`
`538`	`538`	`loop(work())`
`539`	`539`	`loop(e))`
`540`	`540`	`runTimeShare e`
`541`	`541`
`542`		`-letforceAsync(cancellationToken:CancellationToken)(executor:(unit-> Eventually<'T>)->Async<Eventually<'T>>)(e:Eventually<'T>):Async<'Toption>=`
	`542`	`+letforceAsync(runner:(unit-> Eventually<'T>)->Async<Eventually<'T>>)(e:Eventually<'T>):Async<'Toption>=`
`543`	`543`	`let recloop(e:Eventually<'T>)=`
`544`	`544`	`async{`
`545`	`545`	`match ewith`
`546`	`546`	`\| Done x->return Some x`
`547`	`547`	`\| NotYetDone work->`
`548`		`-if cancellationToken.IsCancellationRequestedthenreturn None`
`549`		`-else`
`550`		`-let!r= executor work`
`551`		`-return! loop r`
	`548`	`+let!r= runner work`
	`549`	`+return! loop r`
`552`	`550`	`}`
`553`	`551`	`loop e`
`554`	`552`

`‎src/fsharp/vs/IncrementalBuild.fs‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1497,9 +1497,8 @@ type IncrementalBuilder(frameworkTcImportsCache: FrameworkImportsCache, tcConfig`
`1497`	`1497`	`if ensureReactivethen`
`1498`	`1498`	`lettimeSlicedComputation=`
`1499`	`1499`	`fullComputation\|>`
`1500`		`- Eventually.repeatedlyProgressUntilDoneOrTimeShareOverOrCanceled`
	`1500`	`+ Eventually.repeatedlyProgressUntilDoneOrTimeShareOver`
`1501`	`1501`	`maxTimeShareMilliseconds`
`1502`		`- CancellationToken.None`
`1503`	`1502`	`(fun f->`
`1504`	`1503`	`// Reinstall the compilation globals each time we start or restart`
`1505`	`1504`	`use unwind=new CompilationGlobalsScope(errorLogger, BuildPhase.TypeCheck, projectDirectory)`

`‎src/fsharp/vs/service.fs‎`

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1643,7 +1643,6 @@ module internal Parser =`
`1643`	`1643`
`1644`	`1644`	`// Run the type checker...`
`1645`	`1645`	`\| Some parsedMainInput->`
`1646`		`-let!cancellationToken= Async.CancellationToken`
`1647`	`1646`	`// Initialize the error handler`
`1648`	`1647`	`leterrHandler=new ErrorHandler(true, mainInputFileName, tcConfig, source)`
`1649`	`1648`
`@@ -1730,22 +1729,14 @@ module internal Parser =`
`1730`	`1729`	`letcheckForErrors()=(parseResults.ParseHadErrors\|\| errHandler.ErrorCount>0)`
`1731`	`1730`	`// Typecheck is potentially a long running operation. We chop it up here with an Eventually continuation and, at each slice, give a chance`
`1732`	`1731`	`// for the client to claim the result as obsolete and have the typecheck abort.`
`1733`		`-//let computation = TypeCheckOneInputAndFinishEventually(checkForErrors,tcConfig, tcImports, tcGlobals, None, TcResultsSink.WithSink sink, tcState, parsedMainInput)`
`1734`		`-//match computation \|> Eventually.forceWhile (fun () -> not cancellationToken.IsCancellationRequested) with`
`1735`		`-//\| Some((tcEnvAtEnd,_,typedImplFiles),tcState) -> Some (tcEnvAtEnd, typedImplFiles, tcState)`
`1736`		`-//\| None -> None // Means 'aborted'`
`1737`	`1732`	`letprojectDir= Path.GetDirectoryName(projectFileName)`
`1738`	`1733`	`letcapturingErrorLogger= CompilationErrorLogger("TypeCheckOneFile", tcConfig)`
`1739`	`1734`	`leterrorLogger= GetErrorLoggerFilteringByScopedPragmas(false,GetScopedPragmasForInput(parsedMainInput), capturingErrorLogger)`
`1740`	`1735`
`1741`	`1736`	`let!result=`
`1742`	`1737`	`TypeCheckOneInputAndFinishEventually(checkForErrors,tcConfig, tcImports, tcGlobals, None, TcResultsSink.WithSink sink, tcState, parsedMainInput)`
`1743`		`-\|> Eventually.repeatedlyProgressUntilDoneOrTimeShareOverOrCanceled`
`1744`		`-50L`
`1745`		`- cancellationToken`
`1746`		`-(fun f-> f())`
	`1738`	`+\|> Eventually.repeatedlyProgressUntilDoneOrTimeShareOver50L(fun f-> f())`
`1747`	`1739`	`\|> Eventually.forceAsync`
`1748`		`- cancellationToken`
`1749`	`1740`	`(fun(work: unit-> Eventually<_>)->`
`1750`	`1741`	`reactorOps.EnqueueAndAwaitOpAsync("TypeCheckOneFile",`
`1751`	`1742`	`fun _->`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit17d153e

File tree

3 files changed

3 files changed

`‎src/absil/illib.fs‎`

`‎src/fsharp/vs/IncrementalBuild.fs‎`

`‎src/fsharp/vs/service.fs‎`

0 commit comments