Skip to content

Commit 8981cbb

Browse files
Fix build
1 parent 4a2a189 commit 8981cbb

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

src/fsharp/FSharp.Compiler.Service/service_slim.fs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ open Internal.Utilities.Collections
4545
type internal TcResult = TcEnv * TopAttribs * TypedImplFile option * ModuleOrNamespaceType
4646
type internal TcErrors = FSharpErrorInfo[]
4747

48-
type InteractiveChecker internal (tcConfig, tcGlobals, tcImports, tcInitialState, ctok, reactorOps, parseCache, checkCache) =
48+
type InteractiveChecker internal (tcConfig, tcGlobals, tcImports, tcInitialState, ctok, parseCache, checkCache) =
4949
let userOpName = "Unknown"
5050
let suggestNamesForErrors = true
5151

@@ -72,18 +72,12 @@ type InteractiveChecker internal (tcConfig, tcGlobals, tcImports, tcInitialState
7272
let tcInitialEnv = GetInitialTcEnv (assemblyName, rangeStartup, tcConfig, tcImports, tcGlobals)
7373
let tcInitialState = GetInitialTcState (rangeStartup, assemblyName, tcConfig, tcGlobals, tcImports, niceNameGen, tcInitialEnv)
7474

75-
let reactorOps =
76-
{ new IReactorOperations with
77-
member __.EnqueueAndAwaitOpAsync (userOpName, opName, opArg, op) =
78-
async.Return (Cancellable.runWithoutCancellation (op ctok))
79-
member __.EnqueueOp (userOpName, opName, opArg, op) = (op ctok) }
80-
8175
// parse cache, keyed on file name and source hash
8276
let parseCache = ConcurrentDictionary<string * int, FSharpParseFileResults>(HashIdentity.Structural)
8377
// type check cache, keyed on file name
8478
let checkCache = ConcurrentDictionary<string, (TcResult * TcErrors) * (TcState * ModuleNamesDict)>(HashIdentity.Structural)
8579

86-
InteractiveChecker (tcConfig, tcGlobals, tcImports, tcInitialState, ctok, reactorOps, parseCache, checkCache)
80+
InteractiveChecker (tcConfig, tcGlobals, tcImports, tcInitialState, ctok, parseCache, checkCache)
8781

8882
member private x.MakeProjectResults (projectFileName: string, parseResults: FSharpParseFileResults[], tcState: TcState, errors: FSharpErrorInfo[],
8983
symbolUses: TcSymbolUses list, topAttrsOpt: TopAttribs option, tcImplFilesOpt: TypedImplFile list option) =
@@ -148,16 +142,15 @@ type InteractiveChecker internal (tcConfig, tcGlobals, tcImports, tcInitialState
148142
checkCache.[fileName] <- ((tcResult, tcErrors), (tcState, moduleNamesDict))
149143

150144
let loadClosure = None
151-
let textSnapshotInfo = None
152145
let keepAssemblyContents = true
153146

154147
let tcEnvAtEnd, _topAttrs, implFile, ccuSigForFile = tcResult
155148
let errors = Array.append parseResults.Errors tcErrors
156149

157150
let scope = TypeCheckInfo (tcConfig, tcGlobals, ccuSigForFile, tcState.Ccu, tcImports, tcEnvAtEnd.AccessRights,
158151
projectFileName, fileName, sink.GetResolutions(), sink.GetSymbolUses(), tcEnvAtEnd.NameEnv,
159-
loadClosure, reactorOps, textSnapshotInfo, implFile, sink.GetOpenDeclarations())
160-
FSharpCheckFileResults (fileName, errors, Some scope, parseResults.DependencyFiles, None, reactorOps, keepAssemblyContents)
152+
loadClosure, implFile, sink.GetOpenDeclarations())
153+
FSharpCheckFileResults (fileName, errors, Some scope, parseResults.DependencyFiles, None, keepAssemblyContents)
161154
|> Some
162155
| None ->
163156
None

src/fsharp/service/FSharpCheckerResults.fsi

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ type internal TypeCheckInfo =
9292
sSymbolUses: TcSymbolUses *
9393
sFallback: NameResolutionEnv *
9494
loadClosure : LoadClosure option *
95-
reactorOps : IReactorOperations *
96-
textSnapshotInfo: obj option *
9795
implFileOpt: TypedImplFile option *
9896
openDeclarations: OpenDeclaration[]
9997
-> TypeCheckInfo
@@ -114,7 +112,6 @@ type public FSharpCheckFileResults =
114112
scopeOptX: TypeCheckInfo option *
115113
dependencyFiles: string[] *
116114
builderX: IncrementalBuilder option *
117-
reactorOpsX: IReactorOperations *
118115
keepAssemblyContents: bool
119116
-> FSharpCheckFileResults
120117

0 commit comments

Comments
 (0)