Skip to content

Commit 5f9f9e9

Browse files
KevinRansomKevinRansom
authored
Merge branch 'master' into fix-go-to-definiton-for-recursive-types
2 parents 2afb341 + eb17f65 commit 5f9f9e9

21 files changed

Lines changed: 1274 additions & 332 deletions

File tree

‎build/targets/PackageVersions.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@
4545
<MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioShellInterop100PackageVersion>
4646
<MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61030</MicrosoftVisualStudioShellInterop110PackageVersion>
4747
<MicrosoftVisualStudioShellInterop120PackageVersion>12.0.30110</MicrosoftVisualStudioShellInterop120PackageVersion>
48-
<MicrosoftVisualStudioTextManagerInteropPackageVersion>7.10.6070</MicrosoftVisualStudioTextManagerInteropPackageVersion>
48+
<MicrosoftVisualStudioTextManagerInteropPackageVersion>7.10.6071</MicrosoftVisualStudioTextManagerInteropPackageVersion>
4949
<MicrosoftVisualStudioTextManagerInterop80PackageVersion>8.0.50727</MicrosoftVisualStudioTextManagerInterop80PackageVersion>
5050
<MicrosoftVisualStudioTextManagerInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioTextManagerInterop100PackageVersion>
51+
<MicrosoftVisualStudioTextManagerInterop120PackageVersion>12.0.30112</MicrosoftVisualStudioTextManagerInterop120PackageVersion>
5152
<MicrosoftVisualStudioTextUIPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIPackageVersion>
5253
<MicrosoftVisualStudioTextUIWpfPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIWpfPackageVersion>
5354
<MicrosoftVisualStudioWCFReferenceInteropPackageVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropPackageVersion>

‎setup/Swix/Microsoft.FSharp.Compiler/Files.swr‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp"
2828
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.targets"
2929
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.Targets"
3030
file source="$(BinariesFolder)\net40\bin\Microsoft.Portable.FSharp.Targets"
31-
file source="$(FSharpTreeRoot)\vsintegration\src\SupportedRuntimes\SupportedRuntimes.xml"
3231
file source="$(BinariesFolder)\net40\bin\System.Collections.Immutable.dll"
3332
file source="$(BinariesFolder)\net40\bin\System.Reflection.Metadata.dll"
3433
file source="$(BinariesFolder)\net40\bin\System.ValueTuple.dll"

‎src/fsharp/FSharp.Core/async.fs‎

Lines changed: 77 additions & 54 deletions
Large diffs are not rendered by default.

‎src/fsharp/service/ServiceAssemblyContent.fs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -999,8 +999,11 @@ module ParsedInput =
999999

10001000
mkPos line ctx.Pos.Column
10011001

1002-
let tryFindNearestPointToInsertOpenDeclaration (currentLine: int) (ast: ParsedInput) (entity: Idents) (insertionPoint: OpenStatementInsertionPoint) =
1002+
let findNearestPointToInsertOpenDeclaration (currentLine: int) (ast: ParsedInput) (entity: Idents) (insertionPoint: OpenStatementInsertionPoint) =
10031003
match tryFindNearestPointAndModules currentLine ast insertionPoint with
10041004
| Some (scope, _, point), modules ->
1005-
Some (findBestPositionToInsertOpenDeclaration modules scope point entity)
1006-
| _ -> None
1005+
findBestPositionToInsertOpenDeclaration modules scope point entity
1006+
| _ ->
1007+
// we failed to find insertion point because ast is empty for some reason, return top left point in this case
1008+
{ ScopeKind = ScopeKind.TopModule
1009+
Pos = mkPos 1 0 }

‎src/fsharp/service/ServiceAssemblyContent.fsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ module public ParsedInput =
145145
(( (* requiresQualifiedAccessParent: *) Idents option * (* autoOpenParent: *) Idents option * (* entityNamespace *) Idents option * (* entity: *) Idents) -> (Entity * InsertContext)[])
146146

147147
/// Returns `InsertContext` based on current position and symbol idents.
148-
val tryFindNearestPointToInsertOpenDeclaration : currentLine: int -> ast: Ast.ParsedInput -> entity: Idents -> insertionPoint: OpenStatementInsertionPoint -> InsertContext option
148+
val findNearestPointToInsertOpenDeclaration : currentLine: int -> ast: Ast.ParsedInput -> entity: Idents -> insertionPoint: OpenStatementInsertionPoint -> InsertContext
149149

150150
/// Returns lond identifier at position.
151151
val getLongIdentAt : ast: Ast.ParsedInput -> pos: Range.pos -> Ast.LongIdent option

‎tests/scripts/compiler-perf-results.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ https://github.com/dsyme/visualfsharp.git weak2 35b7
138138
https://github.com/dsyme/visualfsharp.git range1 e49ac8a2f21223e60d0d9597e52ea9e5f8705963 221224e6d20bd835c2b9e01e0a52bf45e740a8d0 MSRC-3617253 275.83 12.79 32.57 53.38 61.94 58.03
139139
https://github.com/dsyme/visualfsharp.git range1 46be8bee06180324b63a3b808cf4a90492a5f095 ff078e94deff66e548efb668465fcdd601cc158d MSRC-3617253 265.13 10.57 35.61 48.73 59.07 59.03
140140

141-
https://github.com/Microsoft/visualfsharp master 221224e6d20bd835c2b9e01e0a52bf45e740a8d0 221224e6d20bd835c2b9e01e0a52bf45e740a8d0 MSRC-3617253 273.00 12.46 32.80 51.38 60.93 58.66
142141
https://github.com/Microsoft/visualfsharp master 4df997507226caa272f2c7d4fbdc52eb71c8ead2 4df997507226caa272f2c7d4fbdc52eb71c8ead2 MSRC-3617253 254.53 11.55 31.80 46.58 57.03 58.89
143142
https://github.com/Microsoft/visualfsharp master 65d87f0b2ee67e50503540aad5d4438fdde14fea 65d87f0b2ee67e50503540aad5d4438fdde14fea MSRC-3617253 257.92 10.44 32.62 45.45 56.68 58.53
144143
https://github.com/Microsoft/visualfsharp master ff078e94deff66e548efb668465fcdd601cc158d ff078e94deff66e548efb668465fcdd601cc158d MSRC-3617253 262.60 10.60 34.99 47.73 59.08 58.46
@@ -147,3 +146,5 @@ https://github.com/AviAvni/visualfsharp.git fcs-memory-3 d91d
147146
https://github.com/AviAvni/visualfsharp.git fcs-memory-3 d91dbc81ce304a88a4e3c07032781421c71e3bab 284cb2ff115adb8ff5b1febe1c305a10c933172e MSRC-3617253 263.53 10.34 35.19 48.32 58.79 59.08
148147
https://github.com/dsyme/visualfsharp.git range1 46be8bee06180324b63a3b808cf4a90492a5f095 284cb2ff115adb8ff5b1febe1c305a10c933172e MSRC-3617253 262.84 10.55 35.17 48.54 59.51 59.15
149148
https://github.com/Microsoft/visualfsharp master 284cb2ff115adb8ff5b1febe1c305a10c933172e 284cb2ff115adb8ff5b1febe1c305a10c933172e MSRC-3617253 262.07 10.58 34.79 48.58 58.51 58.31
149+
https://github.com/Microsoft/visualfsharp master 61907dcd859702924021bc0aad74f64ce459c9f0 61907dcd859702924021bc0aad74f64ce459c9f0 MSRC-3617253 254.94 10.66 37.64 47.23 57.64 58.96
150+
https://github.com/Microsoft/visualfsharp master 61907dcd859702924021bc0aad74f64ce459c9f0 61907dcd859702924021bc0aad74f64ce459c9f0 MSRC-3617253 253.14 10.05 35.05 48.81 58.62 58.47

0 commit comments

Comments
 (0)