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

Commite2902ee

Browse files
auduchinokTIHan
authored andcommitted
Replace isModule with ModuleOrNamespaceKind in SynModuleOrNamespace (dotnet#6027)
* Replace isModule with ModuleOrNamespaceKind in SymModuleOrNamespace* Fix structure tests* Review fixes
1 parent062d6f5 commite2902ee

File tree

9 files changed

+140
-115
lines changed

9 files changed

+140
-115
lines changed

‎src/fsharp/CompileOps.fs‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3384,14 +3384,14 @@ let ComputeQualifiedNameOfFileFromUniquePath (m, p: string list) = QualifiedName
33843384

33853385
letQualFileNameOfSpecs filename specs=
33863386
match specswith
3387-
|[SynModuleOrNamespaceSig(modname,_,true,_,_,_,_, m)]-> QualFileNameOfModuleName m filename modname
3388-
|[SynModuleOrNamespaceSig(_,_,false,_,_,_,_, m)]-> QualFileNameOfFilename m filename
3387+
|[SynModuleOrNamespaceSig(modname,_,kind,_,_,_,_, m)]when kind.IsModule-> QualFileNameOfModuleName m filename modname
3388+
|[SynModuleOrNamespaceSig(_,_,kind,_,_,_,_, m)]whennot kind.IsModule-> QualFileNameOfFilename m filename
33893389
|_-> QualFileNameOfFilename(mkRange filename pos0 pos0) filename
33903390

33913391
letQualFileNameOfImpls filename specs=
33923392
match specswith
3393-
|[SynModuleOrNamespace(modname,_,true,_,_,_,_, m)]-> QualFileNameOfModuleName m filename modname
3394-
|[SynModuleOrNamespace(_,_,false,_,_,_,_, m)]-> QualFileNameOfFilename m filename
3393+
|[SynModuleOrNamespace(modname,_,kind,_,_,_,_, m)]when kind.IsModule-> QualFileNameOfModuleName m filename modname
3394+
|[SynModuleOrNamespace(_,_,kind,_,_,_,_, m)]whennot kind.IsModule-> QualFileNameOfFilename m filename
33953395
|_-> QualFileNameOfFilename(mkRange filename pos0 pos0) filename
33963396

33973397
letPrepandPathToQualFileName x(QualifiedNameOfFile(q))= ComputeQualifiedNameOfFileFromUniquePath(q.idRange, pathOfLid x@[q.idText])
@@ -3420,13 +3420,14 @@ let ComputeAnonModuleName check defaultNamespace filename (m: range) =
34203420

34213421
letPostParseModuleImpl(_i,defaultNamespace,isLastCompiland,filename,impl)=
34223422
match implwith
3423-
| ParsedImplFileFragment.NamedModule(SynModuleOrNamespace(lid, isRec,isModule, decls, xmlDoc, attribs, access, m))->
3423+
| ParsedImplFileFragment.NamedModule(SynModuleOrNamespace(lid, isRec,kind, decls, xmlDoc, attribs, access, m))->
34243424
letlid=
34253425
match lidwith
3426-
|[id]when isModule&& id.idText= MangledGlobalName-> error(Error(FSComp.SR.buildInvalidModuleOrNamespaceName(), id.idRange))
3426+
|[id]when kind.IsModule&& id.idText= MangledGlobalName->
3427+
error(Error(FSComp.SR.buildInvalidModuleOrNamespaceName(), id.idRange))
34273428
| id:: restwhen id.idText= MangledGlobalName-> rest
34283429
|_-> lid
3429-
SynModuleOrNamespace(lid, isRec,isModule, decls, xmlDoc, attribs, access, m)
3430+
SynModuleOrNamespace(lid, isRec,kind, decls, xmlDoc, attribs, access, m)
34303431

34313432
| ParsedImplFileFragment.AnonModule(defs, m)->
34323433
letisLast,isExe= isLastCompiland
@@ -3437,24 +3438,26 @@ let PostParseModuleImpl (_i, defaultNamespace, isLastCompiland, filename, impl)
34373438
|_-> errorR(Error(FSComp.SR.buildMultiFileRequiresNamespaceOrModule(), trimRangeToLine m))
34383439

34393440
letmodname= ComputeAnonModuleName(not(isNil defs)) defaultNamespace filename(trimRangeToLine m)
3440-
SynModuleOrNamespace(modname,false,true, defs, PreXmlDoc.Empty,[], None, m)
3441+
SynModuleOrNamespace(modname,false,AnonModule, defs, PreXmlDoc.Empty,[], None, m)
34413442

3442-
| ParsedImplFileFragment.NamespaceFragment(lid, a,b, c, d, e, m)->
3443-
letlid=
3443+
| ParsedImplFileFragment.NamespaceFragment(lid, a,kind, c, d, e, m)->
3444+
letlid,kind=
34443445
match lidwith
3445-
| id:: restwhen id.idText= MangledGlobalName-> rest
3446-
|_-> lid
3447-
SynModuleOrNamespace(lid, a, b, c, d, e, None, m)
3446+
| id:: restwhen id.idText= MangledGlobalName->
3447+
rest,if List.isEmpty restthen GlobalNamespaceelse kind
3448+
|_-> lid, kind
3449+
SynModuleOrNamespace(lid, a, kind, c, d, e, None, m)
34483450

34493451
letPostParseModuleSpec(_i,defaultNamespace,isLastCompiland,filename,intf)=
34503452
match intfwith
3451-
| ParsedSigFileFragment.NamedModule(SynModuleOrNamespaceSig(lid, isRec,isModule, decls, xmlDoc, attribs, access, m))->
3453+
| ParsedSigFileFragment.NamedModule(SynModuleOrNamespaceSig(lid, isRec,kind, decls, xmlDoc, attribs, access, m))->
34523454
letlid=
34533455
match lidwith
3454-
|[id]when isModule&& id.idText= MangledGlobalName-> error(Error(FSComp.SR.buildInvalidModuleOrNamespaceName(), id.idRange))
3456+
|[id]when kind.IsModule&& id.idText= MangledGlobalName->
3457+
error(Error(FSComp.SR.buildInvalidModuleOrNamespaceName(), id.idRange))
34553458
| id:: restwhen id.idText= MangledGlobalName-> rest
34563459
|_-> lid
3457-
SynModuleOrNamespaceSig(lid, isRec,isModule, decls, xmlDoc, attribs, access, m)
3460+
SynModuleOrNamespaceSig(lid, isRec,NamedModule, decls, xmlDoc, attribs, access, m)
34583461

34593462
| ParsedSigFileFragment.AnonModule(defs, m)->
34603463
letisLast,isExe= isLastCompiland
@@ -3465,14 +3468,15 @@ let PostParseModuleSpec (_i, defaultNamespace, isLastCompiland, filename, intf)
34653468
|_-> errorR(Error(FSComp.SR.buildMultiFileRequiresNamespaceOrModule(), m))
34663469

34673470
letmodname= ComputeAnonModuleName(not(isNil defs)) defaultNamespace filename(trimRangeToLine m)
3468-
SynModuleOrNamespaceSig(modname,false,true, defs, PreXmlDoc.Empty,[], None, m)
3471+
SynModuleOrNamespaceSig(modname,false,AnonModule, defs, PreXmlDoc.Empty,[], None, m)
34693472

3470-
| ParsedSigFileFragment.NamespaceFragment(lid, a,b, c, d, e, m)->
3471-
letlid=
3473+
| ParsedSigFileFragment.NamespaceFragment(lid, a,kind, c, d, e, m)->
3474+
letlid,kind=
34723475
match lidwith
3473-
| id:: restwhen id.idText= MangledGlobalName-> rest
3474-
|_-> lid
3475-
SynModuleOrNamespaceSig(lid, a, b, c, d, e, None, m)
3476+
| id:: restwhen id.idText= MangledGlobalName->
3477+
rest,if List.isEmpty restthen GlobalNamespaceelse kind
3478+
|_-> lid, kind
3479+
SynModuleOrNamespaceSig(lid, a, kind, c, d, e, None, m)
34763480

34773481

34783482

‎src/fsharp/TypeChecker.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16713,7 +16713,7 @@ let rec TcSignatureElementNonMutRec cenv parent typeNames endm (env: TcEnv) synS
1671316713
return env
1671416714

1671516715

16716-
| SynModuleSigDecl.NamespaceFragment (SynModuleOrNamespaceSig(longId, isRec,isModule, defs, xml, attribs, vis, m)) ->
16716+
| SynModuleSigDecl.NamespaceFragment (SynModuleOrNamespaceSig(longId, isRec,kind, defs, xml, attribs, vis, m)) ->
1671716717

1671816718
do for id in longId do
1671916719
CheckNamespaceModuleOrTypeName cenv.g id
@@ -16725,7 +16725,7 @@ let rec TcSignatureElementNonMutRec cenv parent typeNames endm (env: TcEnv) synS
1672516725
// namespace [rec] A.B
1672616726
// module M = ...
1672716727
let enclosingNamespacePath, defs =
16728-
ifisModule then
16728+
ifkind.IsModule then
1672916729
let nsp, modName = List.frontAndBack longId
1673016730
let modDecl = [SynModuleSigDecl.NestedModule(ComponentInfo(attribs, [], [], [modName], xml, false, vis, m), false, defs, m)]
1673116731
nsp, modDecl
@@ -17022,7 +17022,7 @@ let rec TcModuleOrNamespaceElementNonMutRec (cenv:cenv) parent typeNames scopem
1702217022
return ((fun modDefs -> modDefn :: modDefs), topAttrsNew), env, envAtEnd
1702317023

1702417024

17025-
| SynModuleDecl.NamespaceFragment(SynModuleOrNamespace(longId, isRec,isModule, defs, xml, attribs, vis, m)) ->
17025+
| SynModuleDecl.NamespaceFragment(SynModuleOrNamespace(longId, isRec,kind, defs, xml, attribs, vis, m)) ->
1702617026

1702717027
if !progress then dprintn ("Typecheck implementation " + textOfLid longId)
1702817028
let endm = m.EndRange
@@ -17037,7 +17037,7 @@ let rec TcModuleOrNamespaceElementNonMutRec (cenv:cenv) parent typeNames scopem
1703717037
// namespace [rec] A.B
1703817038
// module M = ...
1703917039
let enclosingNamespacePath, defs =
17040-
ifisModule then
17040+
ifkind.IsModule then
1704117041
let nsp, modName = List.frontAndBack longId
1704217042
let modDecl = [SynModuleDecl.NestedModule(ComponentInfo(attribs, [], [], [modName], xml, false, vis, m), false, defs, true, m)]
1704317043
nsp, modDecl

‎src/fsharp/ast.fs‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,19 +1462,31 @@ and
14621462

14631463
andSynModuleSigDecls= SynModuleSigDecl list
14641464

1465-
/// SynModuleOrNamespace(lid,isRec,isModule,decls,xmlDoc,attribs,SynAccess,m)
1465+
and
1466+
[<Struct>]
1467+
SynModuleOrNamespaceKind=
1468+
| NamedModule
1469+
| AnonModule
1470+
| DeclaredNamespace
1471+
| GlobalNamespace
1472+
1473+
memberx.IsModule=
1474+
match xwith
1475+
| NamedModule| AnonModule->true
1476+
|_->false
1477+
14661478
and
14671479
[<NoEquality; NoComparison>]
14681480
SynModuleOrNamespace=
1469-
| SynModuleOrNamespaceoflongId:LongIdent*isRecursive:bool*isModule:bool*decls:SynModuleDecls*xmlDoc:PreXmlDoc*attribs:SynAttributes*accessibility:SynAccessoption*range:range
1481+
| SynModuleOrNamespaceoflongId:LongIdent*isRecursive:bool*kind:SynModuleOrNamespaceKind*decls:SynModuleDecls*xmlDoc:PreXmlDoc*attribs:SynAttributes*accessibility:SynAccessoption*range:range
14701482
memberthis.Range=
14711483
match thiswith
14721484
| SynModuleOrNamespace(range=m)-> m
14731485

14741486
and
14751487
[<NoEquality; NoComparison>]
14761488
SynModuleOrNamespaceSig=
1477-
| SynModuleOrNamespaceSigoflongId:LongIdent*isRecursive:bool*isModule:bool*SynModuleSigDecls*xmlDoc:PreXmlDoc*attribs:SynAttributes*accessibility:SynAccessoption*range:range
1489+
| SynModuleOrNamespaceSigoflongId:LongIdent*isRecursive:bool*kind:SynModuleOrNamespaceKind*SynModuleSigDecls*xmlDoc:PreXmlDoc*attribs:SynAttributes*accessibility:SynAccessoption*range:range
14781490

14791491
and [<NoEquality; NoComparison>]
14801492
ParsedHashDirective=
@@ -1484,13 +1496,13 @@ and [<NoEquality; NoComparison>]
14841496
typeParsedImplFileFragment=
14851497
| AnonModuleofSynModuleDecls*range:range
14861498
| NamedModuleofSynModuleOrNamespace
1487-
| NamespaceFragmentoflongId:LongIdent*bool*bool*SynModuleDecls*xmlDoc:PreXmlDoc*SynAttributes*range:range
1499+
| NamespaceFragmentoflongId:LongIdent*bool*SynModuleOrNamespaceKind*SynModuleDecls*xmlDoc:PreXmlDoc*SynAttributes*range:range
14881500

14891501
[<NoEquality; NoComparison; RequireQualifiedAccess>]
14901502
typeParsedSigFileFragment=
14911503
| AnonModuleofSynModuleSigDecls*range:range
14921504
| NamedModuleofSynModuleOrNamespaceSig
1493-
| NamespaceFragmentoflongId:LongIdent*bool*bool*SynModuleSigDecls*xmlDoc:PreXmlDoc*SynAttributes*range:range
1505+
| NamespaceFragmentoflongId:LongIdent*bool*SynModuleOrNamespaceKind*SynModuleSigDecls*xmlDoc:PreXmlDoc*SynAttributes*range:range
14941506

14951507
[<NoEquality; NoComparison>]
14961508
typeParsedFsiInteraction=

‎src/fsharp/fsi/fsi.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ type internal FsiDynamicCompiler
11541154
leti= nextFragmentId()
11551155
letprefix= mkFragmentPath i
11561156
letprefixPath= pathOfLid prefix
1157-
letimpl= SynModuleOrNamespace(prefix,(*isRec*)false,(* isModule:*)true,defs,PreXmlDoc.Empty,[],None,rangeStdin)
1157+
letimpl= SynModuleOrNamespace(prefix,(*isRec*)false,NamedModule,defs,PreXmlDoc.Empty,[],None,rangeStdin)
11581158
letinput= ParsedInput.ImplFile(ParsedImplFileInput(filename,true, ComputeQualifiedNameOfFileFromUniquePath(rangeStdin,prefixPath),[],[],[impl],(true(* isLastCompiland*),false(* isExe*))))
11591159
letistate,tcEnvAtEndOfLastInput,declaredImpls= ProcessInputs(ctok, errorLogger, istate,[input], showTypes,true, isInteractiveItExpr, prefix)
11601160
lettcState= istate.tcState

‎src/fsharp/pars.fsy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -675,14 +675,14 @@ fileModuleSpec:
675675
(fun (isRec2,path,_) ->
676676
if not (isNil path) then errorR(Error(FSComp.SR.parsNamespaceOrModuleNotBoth(),m2))
677677
let lid = path@path2
678-
ParsedSigFileFragment.NamedModule(SynModuleOrNamespaceSig(lid, (isRec || isRec2),true, $4, xml,$1,vis,m))) }
678+
ParsedSigFileFragment.NamedModule(SynModuleOrNamespaceSig(lid, (isRec || isRec2),NamedModule, $4, xml,$1,vis,m))) }
679679

680680
| moduleSpfnsPossiblyEmptyBlock
681681
{ let m = (rhs parseState 1)
682682
(fun (isRec, path, xml) ->
683683
match path with
684684
| [] -> ParsedSigFileFragment.AnonModule($1, m)
685-
| _ -> ParsedSigFileFragment.NamespaceFragment(path, isRec,false, $1, xml,[],m)) }
685+
| _ -> ParsedSigFileFragment.NamespaceFragment(path, isRec,DeclaredNamespace, $1, xml,[],m)) }
686686

687687

688688
moduleSpfnsPossiblyEmptyBlock:
@@ -1097,14 +1097,14 @@ fileModuleImpl:
10971097
(fun (isRec, path, _) ->
10981098
if not (isNil path) then errorR(Error(FSComp.SR.parsNamespaceOrModuleNotBoth(),m2))
10991099
let lid = path@path2
1100-
ParsedImplFileFragment.NamedModule(SynModuleOrNamespace(lid, (isRec || isRec2),true, $4, xml,$1,vis,m))) }
1100+
ParsedImplFileFragment.NamedModule(SynModuleOrNamespace(lid, (isRec || isRec2),NamedModule, $4, xml,$1,vis,m))) }
11011101

11021102
| moduleDefnsOrExprPossiblyEmptyOrBlock
11031103
{ let m = (rhs parseState 1)
11041104
(fun (isRec, path, xml) ->
11051105
match path with
11061106
| [] -> ParsedImplFileFragment.AnonModule($1,m)
1107-
| _ -> ParsedImplFileFragment.NamespaceFragment(path, isRec,false, $1, xml,[],m)) }
1107+
| _ -> ParsedImplFileFragment.NamespaceFragment(path, isRec,DeclaredNamespace, $1, xml,[],m)) }
11081108

11091109

11101110
/* A collection/block of definitions or expressions making up a module or namespace, possibly empty */

‎src/fsharp/service/ServiceAssemblyContent.fs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,9 @@ module ParsedInput =
914914
let recwalkImplFileInput(ParsedImplFileInput(modules= moduleOrNamespaceList))=
915915
List.iter(walkSynModuleOrNamespace[]) moduleOrNamespaceList
916916

917-
andwalkSynModuleOrNamespace(parent:LongIdent)(SynModuleOrNamespace(ident,_,isModule,decls,_,_,_,range))=
917+
andwalkSynModuleOrNamespace(parent:LongIdent)(SynModuleOrNamespace(ident,_,kind,decls,_,_,_,range))=
918918
if range.EndLine>= currentLinethen
919+
letisModule= kind.IsModule
919920
match isModule, parent, identwith
920921
|false,_,_-> ns:= Some(longIdentToIdents ident)
921922
// top level module with "inlined" namespace like Ns1.Ns2.TopModule

‎src/fsharp/service/ServiceNavigation.fs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ module NavigationImpl =
270270
letitems=
271271
// Show base name for this module only if it's not the root one
272272
letsingleTopLevel=(modules.Length=1)
273-
modules|> List.collect(fun(SynModuleOrNamespace(id,_isRec,isModule,decls,_,_,access,m))->
273+
modules|> List.collect(fun(SynModuleOrNamespace(id,_isRec,kind,decls,_,_,access,m))->
274274
letbaseName=if(not singleTopLevel)then textOfLid idelse""
275275
// Find let bindings (for the right dropdown)
276276
letnested= processNestedDeclarations(decls)
@@ -283,7 +283,7 @@ module NavigationImpl =
283283
|_->
284284
letdecl=
285285
FSharpNavigationDeclarationItem.Create
286-
(textOfLid id,(ifisModulethen ModuleFileDeclelse NamespaceDecl),
286+
(textOfLid id,(ifkind.IsModulethen ModuleFileDeclelse NamespaceDecl),
287287
FSharpGlyph.Module, m,
288288
unionRangesChecked(rangeOfDecls nested)(moduleRange(rangeOfLid id) other),
289289
singleTopLevel, FSharpEnclosingEntityKind.Module,false, access),(addItemName(textOfLid id)), nested
@@ -410,7 +410,7 @@ module NavigationImpl =
410410
letitems=
411411
// Show base name for this module only if it's not the root one
412412
letsingleTopLevel=(modules.Length=1)
413-
modules|> List.collect(fun(SynModuleOrNamespaceSig(id,_isRec,isModule,decls,_,_,access,m))->
413+
modules|> List.collect(fun(SynModuleOrNamespaceSig(id,_isRec,kind,decls,_,_,access,m))->
414414
letbaseName=if(not singleTopLevel)then textOfLid idelse""
415415
// Find let bindings (for the right dropdown)
416416
letnested= processNestedSigDeclarations(decls)
@@ -420,7 +420,7 @@ module NavigationImpl =
420420
// Create explicitly - it can be 'single top level' thing that is hidden
421421
letdecl=
422422
FSharpNavigationDeclarationItem.Create
423-
(textOfLid id,(ifisModulethen ModuleFileDeclelse NamespaceDecl),
423+
(textOfLid id,(ifkind.IsModulethen ModuleFileDeclelse NamespaceDecl),
424424
FSharpGlyph.Module, m,
425425
unionRangesChecked(rangeOfDecls nested)(moduleRange(rangeOfLid id) other),
426426
singleTopLevel, FSharpEnclosingEntityKind.Module,false, access),(addItemName(textOfLid id)), nested
@@ -574,7 +574,8 @@ module NavigateTo =
574574
for itemin moduleOrNamespaceListdo
575575
walkSynModuleOrNamespaceSig item{ Type= ContainerType.File; Name= fileName}
576576

577-
andwalkSynModuleOrNamespaceSig(SynModuleOrNamespaceSig(lid,_,isModule,decls,_,_,_,_))container=
577+
andwalkSynModuleOrNamespaceSig(SynModuleOrNamespaceSig(lid,_,kind,decls,_,_,_,_))container=
578+
letisModule= kind.IsModule
578579
if isModulethen
579580
addModule lidtrue container
580581
letcontainer=
@@ -631,7 +632,8 @@ module NavigateTo =
631632
for itemin moduleOrNamespaceListdo
632633
walkSynModuleOrNamespace item container
633634

634-
andwalkSynModuleOrNamespace(SynModuleOrNamespace(lid,_,isModule,decls,_,_,_,_))container=
635+
andwalkSynModuleOrNamespace(SynModuleOrNamespace(lid,_,kind,decls,_,_,_,_))container=
636+
letisModule= kind.IsModule
635637
if isModulethen
636638
addModule lidfalse container
637639
letcontainer=

‎src/fsharp/service/ServiceStructure.fs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -610,14 +610,14 @@ module Structure =
610610
parseAttributes attrs
611611
|_->()
612612

613-
letparseModuleOrNamespaceisScript(SynModuleOrNamespace(longId,_,isModule,decls,_,attribs,_,r))=
613+
letparseModuleOrNamespace(SynModuleOrNamespace(longId,_,kind,decls,_,attribs,_,r))=
614614
parseAttributes attribs
615615
letidRange= longIdentRange longId
616616
letfullrange= Range.startToEnd idRange r
617617
letcollapse= Range.endToEnd idRange r
618618

619619
// do not return range for top level implicit module in scripts
620-
ifisModule&&not isScriptthen
620+
ifkind= NamedModulethen
621621
rcheck Scope.Module Collapse.Below fullrange collapse
622622

623623
collectHashDirectives decls
@@ -833,23 +833,23 @@ module Structure =
833833
List.iter parseModuleSigDeclaration decls
834834
|_->()
835835

836-
letparseModuleOrNamespaceSigs(SynModuleOrNamespaceSig(longId,_,isModule,decls,_,attribs,_,r))=
836+
letparseModuleOrNamespaceSigs(SynModuleOrNamespaceSig(longId,_,kind,decls,_,attribs,_,r))=
837837
parseAttributes attribs
838838
letrangeEnd= lastModuleSigDeclRangeElse r decls
839839
letidrange= longIdentRange longId
840840
letfullrange= Range.startToEnd idrange rangeEnd
841841
letcollapse= Range.endToEnd idrange rangeEnd
842842

843-
ifisModulethen
843+
ifkind.IsModulethen
844844
rcheck Scope.Module Collapse.Below fullrange collapse
845845

846846
collectSigHashDirectives decls
847847
collectSigOpens decls
848848
List.iter parseModuleSigDeclaration decls
849849

850850
match parsedInputwith
851-
| ParsedInput.ImplFile(ParsedImplFileInput(modules= modules; isScript= isScript))->
852-
modules|> List.iter(parseModuleOrNamespace isScript)
851+
| ParsedInput.ImplFile(ParsedImplFileInput(modules= modules))->
852+
modules|> List.iter parseModuleOrNamespace
853853
getCommentRanges sourceLines
854854
| ParsedInput.SigFile(ParsedSigFileInput(modules= moduleSigs))->
855855
List.iter parseModuleOrNamespaceSigs moduleSigs

0 commit comments

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