Skip to content

Commit 6c753b9

Browse files
authored
Merge pull request #9236 from dotnet/merges/master-to-release/dev16.7
Merge master to release/dev16.7
2 parents 16b8c71 + 348ed06 commit 6c753b9

5 files changed

Lines changed: 341 additions & 190 deletions

File tree

src/fsharp/SyntaxTree.fs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type LongIdent = Ident list
2929
type LongIdentWithDots =
3030
| LongIdentWithDots of id: LongIdent * dotms: range list
3131

32-
/// Gets the syntax range of this constuct
32+
/// Gets the syntax range of this construct
3333
member this.Range =
3434
match this with
3535
| LongIdentWithDots([], _) -> failwith "rangeOfLidwd"
@@ -44,7 +44,7 @@ type LongIdentWithDots =
4444
/// Indicates if the construct ends in '.' due to error recovery
4545
member this.ThereIsAnExtraDotAtTheEnd = match this with LongIdentWithDots(lid, dots) -> lid.Length = dots.Length
4646

47-
/// Gets the syntax range for part of this constuct
47+
/// Gets the syntax range for part of this construct
4848
member this.RangeSansAnyExtraDot =
4949
match this with
5050
| LongIdentWithDots([], _) -> failwith "rangeOfLidwd"
@@ -75,7 +75,7 @@ type TyparStaticReq =
7575
type SynTypar =
7676
| Typar of ident: Ident * staticReq: TyparStaticReq * isCompGen: bool
7777

78-
/// Gets the syntax range of this constuct
78+
/// Gets the syntax range of this construct
7979
member this.Range =
8080
match this with
8181
| Typar(id, _, _) ->
@@ -154,7 +154,7 @@ type SynConst =
154154
/// Old comment: "we never iterate, so the const here is not another SynConst.Measure"
155155
| Measure of constant: SynConst * SynMeasure
156156

157-
/// Gets the syntax range of this constuct
157+
/// Gets the syntax range of this construct
158158
member c.Range dflt =
159159
match c with
160160
| SynConst.String (_, m0) | SynConst.Bytes (_, m0) -> m0
@@ -322,7 +322,7 @@ type RecordFieldName = LongIdentWithDots * bool
322322

323323
/// Indicates if an expression is an atomic expression.
324324
///
325-
/// An atomic expression has no whitespace unlessenclosed in parentheses, e.g.
325+
/// An atomic expression has no whitespace unless enclosed in parentheses, e.g.
326326
/// 1, "3", ident, ident.[expr] and (expr). If an atomic expression has type T,
327327
/// then the largest expression ending at the same range as the atomic expression
328328
/// also has type T.
@@ -802,7 +802,7 @@ type SynExpr =
802802

803803
/// F# syntax: expr.ident...ident <- expr
804804
| DotSet of
805-
targetExpe: SynExpr *
805+
targetExpr: SynExpr *
806806
longDotId: LongIdentWithDots *
807807
rhsExpr: SynExpr *
808808
range: range
@@ -1003,7 +1003,7 @@ type SynExpr =
10031003
expr: SynExpr *
10041004
range: range
10051005

1006-
/// Gets the syntax range of this constuct
1006+
/// Gets the syntax range of this construct
10071007
member e.Range =
10081008
match e with
10091009
| SynExpr.Paren (_, leftParenRange, rightParenRange, r) ->
@@ -1123,7 +1123,7 @@ type SynIndexerArg =
11231123
expr: SynExpr *
11241124
fromEnd: bool * range
11251125

1126-
/// Gets the syntax range of this constuct
1126+
/// Gets the syntax range of this construct
11271127
member x.Range = match x with Two (e1, _, e2, _, _, _) -> unionRanges e1.Range e2.Range | One (e, _, _) -> e.Range
11281128

11291129
/// Get the one or two expressions as a list
@@ -1205,7 +1205,7 @@ type SynSimplePats =
12051205
targetType: SynType *
12061206
range: range
12071207

1208-
/// Represents a syntax tree for argumments patterns
1208+
/// Represents a syntax tree for arguments patterns
12091209
type SynArgPats =
12101210
| Pats of
12111211
pats: SynPat list
@@ -1273,7 +1273,7 @@ type SynPat =
12731273
elementPats: SynPat list *
12741274
range: range
12751275

1276-
/// A parentehsized pattern
1276+
/// A parenthesized pattern
12771277
| Paren of
12781278
pat: SynPat *
12791279
range: range
@@ -1327,7 +1327,7 @@ type SynPat =
13271327
pat: SynPat *
13281328
range: range
13291329

1330-
/// Gets the syntax range of this constuct
1330+
/// Gets the syntax range of this construct
13311331
member p.Range =
13321332
match p with
13331333
| SynPat.Const (range=m)
@@ -1365,15 +1365,15 @@ type SynMatchClause =
13651365
range: range *
13661366
spInfo: DebugPointForTarget
13671367

1368-
/// Gets the syntax range of part of this constuct
1368+
/// Gets the syntax range of part of this construct
13691369
member this.RangeOfGuardAndRhs =
13701370
match this with
13711371
| Clause(_, eo, e, _, _) ->
13721372
match eo with
13731373
| None -> e.Range
13741374
| Some x -> unionRanges e.Range x.Range
13751375

1376-
/// Gets the syntax range of this constuct
1376+
/// Gets the syntax range of this construct
13771377
member this.Range =
13781378
match this with
13791379
| Clause(_, eo, e, m, _) ->
@@ -1596,7 +1596,7 @@ type SynTypeDefnSimpleRepr =
15961596
| Exception of
15971597
exnRepr: SynExceptionDefnRepr
15981598

1599-
/// Gets the syntax range of this constuct
1599+
/// Gets the syntax range of this construct
16001600
member this.Range =
16011601
match this with
16021602
| Union (range=m)
@@ -1618,7 +1618,7 @@ type SynEnumCase =
16181618
xmldoc: PreXmlDoc *
16191619
range: range
16201620

1621-
/// Gets the syntax range of this constuct
1621+
/// Gets the syntax range of this construct
16221622
member this.Range =
16231623
match this with
16241624
| EnumCase (range=m) -> m
@@ -1635,7 +1635,7 @@ type SynUnionCase =
16351635
accessibility: SynAccess option *
16361636
range: range
16371637

1638-
/// Gets the syntax range of this constuct
1638+
/// Gets the syntax range of this construct
16391639
member this.Range =
16401640
match this with
16411641
| UnionCase (range=m) -> m
@@ -1670,7 +1670,7 @@ type SynTypeDefnSigRepr =
16701670

16711671
| Exception of SynExceptionDefnRepr
16721672

1673-
/// Gets the syntax range of this constuct
1673+
/// Gets the syntax range of this construct
16741674
member this.Range =
16751675
match this with
16761676
| ObjectModel (range=m)
@@ -1715,7 +1715,7 @@ type SynComponentInfo =
17151715
accessibility: SynAccess option *
17161716
range: range
17171717

1718-
/// Gets the syntax range of this constuct
1718+
/// Gets the syntax range of this construct
17191719
member this.Range =
17201720
match this with
17211721
| ComponentInfo (range=m) -> m
@@ -1785,7 +1785,7 @@ type SynExceptionDefnRepr =
17851785
accessibility: SynAccess option *
17861786
range: range
17871787

1788-
/// Gets the syntax range of this constuct
1788+
/// Gets the syntax range of this construct
17891789
member this.Range = match this with SynExceptionDefnRepr (range=m) -> m
17901790

17911791
/// Represents the right hand side of an exception declaration 'exception E = ... ' plus
@@ -1798,7 +1798,7 @@ type SynExceptionDefn =
17981798
members: SynMemberDefns *
17991799
range: range
18001800

1801-
/// Gets the syntax range of this constuct
1801+
/// Gets the syntax range of this construct
18021802
member this.Range =
18031803
match this with
18041804
| SynExceptionDefn (range=m) -> m
@@ -1823,7 +1823,7 @@ type SynTypeDefnRepr =
18231823
| Exception of
18241824
exnRepr: SynExceptionDefnRepr
18251825

1826-
/// Gets the syntax range of this constuct
1826+
/// Gets the syntax range of this construct
18271827
member this.Range =
18281828
match this with
18291829
| ObjectModel (range=m)
@@ -1840,7 +1840,7 @@ type SynTypeDefn =
18401840
members: SynMemberDefns *
18411841
range: range
18421842

1843-
/// Gets the syntax range of this constuct
1843+
/// Gets the syntax range of this construct
18441844
member this.Range =
18451845
match this with
18461846
| TypeDefn (range=m) -> m
@@ -1924,7 +1924,7 @@ type SynMemberDefn =
19241924
getSetRange: range option *
19251925
range: range
19261926

1927-
/// Gets the syntax range of this constuct
1927+
/// Gets the syntax range of this construct
19281928
member d.Range =
19291929
match d with
19301930
| SynMemberDefn.Member (range=m)
@@ -2000,7 +2000,7 @@ type SynModuleDecl =
20002000
| NamespaceFragment of
20012001
fragment: SynModuleOrNamespace
20022002

2003-
/// Gets the syntax range of this constuct
2003+
/// Gets the syntax range of this construct
20042004
member d.Range =
20052005
match d with
20062006
| SynModuleDecl.ModuleAbbrev (range=m)
@@ -2068,7 +2068,7 @@ type SynModuleSigDecl =
20682068
| NamespaceFragment of
20692069
SynModuleOrNamespaceSig
20702070

2071-
/// Gets the syntax range of this constuct
2071+
/// Gets the syntax range of this construct
20722072
member d.Range =
20732073
match d with
20742074
| SynModuleSigDecl.ModuleAbbrev (range=m)
@@ -2114,7 +2114,7 @@ type SynModuleOrNamespace =
21142114
accessibility: SynAccess option *
21152115
range: range
21162116

2117-
/// Gets the syntax range of this constuct
2117+
/// Gets the syntax range of this construct
21182118
member this.Range =
21192119
match this with
21202120
| SynModuleOrNamespace (range=m) -> m
@@ -2228,7 +2228,7 @@ type QualifiedNameOfFile =
22282228
/// The identifier for the name of the file
22292229
member x.Id = (let (QualifiedNameOfFile t) = x in t)
22302230

2231-
/// Gets the syntax range of this constuct
2231+
/// Gets the syntax range of this construct
22322232
member x.Range = (let (QualifiedNameOfFile t) = x in t.idRange)
22332233

22342234
/// Represents the full syntax tree, file name and other parsing information for an implementation file
@@ -2262,7 +2262,7 @@ type ParsedInput =
22622262
/// A parsed signature file
22632263
| SigFile of ParsedSigFileInput
22642264

2265-
/// Gets the syntax range of this constuct
2265+
/// Gets the syntax range of this construct
22662266
member inp.Range =
22672267
match inp with
22682268
| ParsedInput.ImplFile (ParsedImplFileInput (modules=SynModuleOrNamespace(range=m) :: _))

0 commit comments

Comments
 (0)