Skip to content

Commit 873eefc

Browse files
dotnet-botdsymepsfinakinojafedgarfgp
authored
Merge main to release/dev17.4 (#13499)
* ValRepInfoForDisplay added for improved quick info for functions defined in expressions * Update * Update QuickInfoTests.fs * Update QuickInfoTests.fs * Update * add identifier analysis script (#13486) * add identifier analysis script * add identifier analysis script * Update fantomas alpha 11 (#13481) * Allow lower-case DU cases when RequireQualifiedAccess is specified (#13432) * Allow lower-case DU cases when RequireQualifiedAccess is specified * Fix PR suggestions and Add more testing * Protect feature under preview version * Add a NotUpperCaseConstructorWithoutRQA warning to be raised in lang version preview * Fix formatting * regularize some names (#13489) * normalize some names * format code * fix build * Subtraction of two chars, new conversions, and fixes for dynamic operator invocations and QuotationToExpression (#11681) Co-authored-by: Vlad Zarytovskii <[email protected]> Co-authored-by: Don Syme <[email protected]> * Mark backing fields as CompilerGenerated (fixes serialization of fields in FSI multiemit) (#13494) Co-authored-by: Don Syme <[email protected]> Co-authored-by: Peter Semkin <[email protected]> Co-authored-by: Don Syme <[email protected]> Co-authored-by: Florian Verdonck <[email protected]> Co-authored-by: Petr Semkin <[email protected]> Co-authored-by: Edgar Gonzalez <[email protected]> Co-authored-by: Hadrian Tang <[email protected]> Co-authored-by: Vlad Zarytovskii <[email protected]> Co-authored-by: Kevin Ransom (msft) <[email protected]>
1 parent 89cb1b5 commit 873eefc

File tree

126 files changed

+6302
-1963
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+6302
-1963
lines changed

VisualFSharp.sln

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@ EndProject
8484
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Test.Utilities", "tests\FSharp.Test.Utilities\FSharp.Test.Utilities.fsproj", "{60D275B0-B14A-41CB-A1B2-E815A7448FCB}"
8585
EndProject
8686
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpSuite.Tests", "tests\fsharp\FSharpSuite.Tests.fsproj", "{C163E892-5BF7-4B59-AA99-B0E8079C67C4}"
87+
ProjectSection(ProjectDependencies) = postProject
88+
{0973C362-585C-4838-9459-D7E45C6B784B} = {0973C362-585C-4838-9459-D7E45C6B784B}
89+
{37EB3E54-ABC6-4CF5-8273-7CE4B61A42C1} = {37EB3E54-ABC6-4CF5-8273-7CE4B61A42C1}
90+
{511C95D9-3BA6-451F-B6F8-F033F40878A5} = {511C95D9-3BA6-451F-B6F8-F033F40878A5}
91+
{597D9896-4B90-4E9E-9C99-445C2CB9FF60} = {597D9896-4B90-4E9E-9C99-445C2CB9FF60}
92+
{E54456F4-D51A-4334-B225-92EBBED92B40} = {E54456F4-D51A-4334-B225-92EBBED92B40}
93+
{EB015235-1E07-4CDA-9CC6-3FBCC27910D1} = {EB015235-1E07-4CDA-9CC6-3FBCC27910D1}
94+
EndProjectSection
8795
EndProject
8896
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.UnitTests", "tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj", "{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
8997
EndProject
@@ -149,8 +157,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Service", "
149157
EndProject
150158
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Service.Tests", "tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj", "{14F3D3D6-5C8E-43C2-98A2-17EA704D4DEA}"
151159
ProjectSection(ProjectDependencies) = postProject
152-
{FF76BD3C-5E0A-4752-B6C3-044F6E15719B} = {FF76BD3C-5E0A-4752-B6C3-044F6E15719B}
153160
{887630A3-4B1D-40EA-B8B3-2D842E9C40DB} = {887630A3-4B1D-40EA-B8B3-2D842E9C40DB}
161+
{FF76BD3C-5E0A-4752-B6C3-044F6E15719B} = {FF76BD3C-5E0A-4752-B6C3-044F6E15719B}
154162
EndProjectSection
155163
EndProject
156164
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VisualFSharpDebug", "vsintegration\Vsix\VisualFSharpFull\VisualFSharpDebug.csproj", "{A422D673-8E3B-4924-821B-DD3174173426}"

azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ trigger:
1212
exclude:
1313
- .github/*
1414
- docs/
15+
- tests/scripts/
1516
- attributions.md
1617
- CODE_OF_CONDUCT.md
1718
- DEVGUIDE.md

src/Compiler/AbstractIL/ilreflect.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -479,11 +479,11 @@ module Zmap =
479479

480480
let equalTypes (s: Type) (t: Type) = s.Equals t
481481

482-
let equalTypeLists ss tt =
483-
List.lengthsEqAndForall2 equalTypes ss tt
482+
let equalTypeLists (tys1: Type list) (tys2: Type list) =
483+
List.lengthsEqAndForall2 equalTypes tys1 tys2
484484

485-
let equalTypeArrays ss tt =
486-
Array.lengthsEqAndForall2 equalTypes ss tt
485+
let equalTypeArrays (tys1: Type[]) (tys2: Type[]) =
486+
Array.lengthsEqAndForall2 equalTypes tys1 tys2
487487

488488
let getGenericArgumentsOfType (typT: Type) =
489489
if typT.IsGenericType then

src/Compiler/AbstractIL/ilx.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ type IlxClosureApps =
7575
let rec instAppsAux n inst apps =
7676
match apps with
7777
| Apps_tyapp (ty, rest) -> Apps_tyapp(instILTypeAux n inst ty, instAppsAux n inst rest)
78-
| Apps_app (dty, rest) -> Apps_app(instILTypeAux n inst dty, instAppsAux n inst rest)
78+
| Apps_app (domainTy, rest) -> Apps_app(instILTypeAux n inst domainTy, instAppsAux n inst rest)
7979
| Apps_done retTy -> Apps_done(instILTypeAux n inst retTy)
8080

8181
let rec instLambdasAux n inst lambdas =

src/Compiler/Checking/CheckComputationExpressions.fs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,10 @@ let TcComputationExpression (cenv: cenv) env (overallTy: OverallTy) tpenv (mWhol
224224
// Give bespoke error messages for the FSharp.Core "query" builder
225225
let isQuery =
226226
match stripDebugPoints interpExpr with
227-
| Expr.Val (vf, _, m) ->
228-
let item = Item.CustomBuilder (vf.DisplayName, vf)
227+
| Expr.Val (vref, _, m) ->
228+
let item = Item.CustomBuilder (vref.DisplayName, vref)
229229
CallNameResolutionSink cenv.tcSink (m, env.NameEnv, item, emptyTyparInst, ItemOccurence.Use, env.eAccessRights)
230-
valRefEq cenv.g vf cenv.g.query_value_vref
230+
valRefEq cenv.g vref cenv.g.query_value_vref
231231
| _ -> false
232232

233233
/// Make a builder.Method(...) call
@@ -1909,8 +1909,8 @@ let TcSequenceExpression (cenv: cenv) env tpenv comp (overallTy: OverallTy) m =
19091909
// This transformation is visible in quotations and thus needs to remain.
19101910
| (TPat_as (TPat_wild _, PatternValBinding (v, _), _),
19111911
[_],
1912-
DebugPoints(Expr.App (Expr.Val (vf, _, _), _, [genEnumElemTy], [yieldExpr], _mYield), recreate))
1913-
when valRefEq cenv.g vf cenv.g.seq_singleton_vref ->
1912+
DebugPoints(Expr.App (Expr.Val (vref, _, _), _, [genEnumElemTy], [yieldExpr], _mYield), recreate))
1913+
when valRefEq cenv.g vref cenv.g.seq_singleton_vref ->
19141914

19151915
// The debug point mFor is attached to the 'map'
19161916
// The debug point mIn is attached to the lambda
@@ -2051,11 +2051,11 @@ let TcSequenceExpression (cenv: cenv) env tpenv comp (overallTy: OverallTy) m =
20512051
error(Error(FSComp.SR.tcUseForInSequenceExpression(), m))
20522052

20532053
| SynExpr.Match (spMatch, expr, clauses, _m, _trivia) ->
2054-
let inputExpr, matchty, tpenv = TcExprOfUnknownType cenv env tpenv expr
2054+
let inputExpr, inputTy, tpenv = TcExprOfUnknownType cenv env tpenv expr
20552055

20562056
let tclauses, tpenv =
20572057
(tpenv, clauses) ||> List.mapFold (fun tpenv (SynMatchClause(pat, cond, innerComp, _, sp, _)) ->
2058-
let patR, condR, vspecs, envinner, tpenv = TcMatchPattern cenv matchty env tpenv pat cond
2058+
let patR, condR, vspecs, envinner, tpenv = TcMatchPattern cenv inputTy env tpenv pat cond
20592059
let envinner =
20602060
match sp with
20612061
| DebugPointAtTarget.Yes -> { envinner with eIsControlFlow = true }

0 commit comments

Comments
 (0)