Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update fcs 43 7 300 #1116

Merged
merged 31 commits into from Jun 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
dc0aa38
reenable dotnet-tools feed for nightly FCS
baronfel Feb 20, 2023
f451fd0
minimal changes to update to latest FCS
baronfel Feb 20, 2023
7fce94d
add nightly to testing matrix
baronfel Feb 20, 2023
ed2c864
add a workflow that updates FCS on a regular cadence
baronfel Feb 20, 2023
cf2b0e7
fix formatting
baronfel Feb 20, 2023
9aa7178
fix formatting of cron expression
baronfel Feb 20, 2023
3fda100
give the new workflow a name
baronfel Feb 20, 2023
0deab12
update Proj-Info to enable nightly FCS updates without breaking the w…
baronfel Feb 20, 2023
19683a1
enable update now that proj-info is unblocked
baronfel Feb 20, 2023
c7e3921
updated FCS to the latest nightly
invalid-email-address Feb 20, 2023
aa054b6
updated FCS to the latest nightly
invalid-email-address Feb 23, 2023
162b9b9
updated FCS to the latest nightly
invalid-email-address Feb 24, 2023
5962938
updated FCS to the latest nightly
invalid-email-address Feb 25, 2023
2cf2494
update from AST changes
baronfel Feb 25, 2023
6658216
merge main
baronfel Feb 25, 2023
ade0f4f
Merge branch 'main' into nightly
baronfel Feb 25, 2023
cf32450
Merge branch 'main' into nightly
baronfel Feb 26, 2023
3380bb0
Merge branch 'main' into nightly
baronfel Feb 26, 2023
4c5e159
Merge branch 'main' into nightly
baronfel Mar 3, 2023
78f2864
bump FCS nightly again
baronfel Mar 3, 2023
b108431
Merge branch 'main' into nightly
baronfel Mar 12, 2023
16c6dbc
Add fsproj/renameFilex (#1075)
MangelMaxime Mar 13, 2023
213a302
Merge branch 'main' into nightly
baronfel Mar 13, 2023
a8ed709
fix bad merge from main
baronfel Mar 13, 2023
355cea5
fix bad merge from main
baronfel Mar 16, 2023
60dfd46
Merge branch 'main' into nightly
baronfel Mar 20, 2023
19cd678
bump nightly FCS
baronfel Mar 20, 2023
662e753
bump FCS
baronfel Mar 24, 2023
ed114b6
Merge commit '662e753a18d01a7be424cecee0b999455c20f929' into update-f…
TheAngryByrd Jun 9, 2023
e5453e5
Fixups for 43.7.300
TheAngryByrd Jun 9, 2023
4b34a2a
fix fake msbuild
TheAngryByrd Jun 9, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions paket.dependencies
Expand Up @@ -12,7 +12,7 @@ lowest_matching: true


nuget Fantomas.Client >= 0.9
nuget FSharp.Compiler.Service >= 43.7.200
nuget FSharp.Compiler.Service >= 43.7.300
nuget Ionide.ProjInfo >= 0.61.3
nuget Ionide.ProjInfo.FCS >= 0.61.3
nuget Ionide.ProjInfo.ProjectSystem >= 0.61.3
Expand All @@ -27,7 +27,6 @@ nuget ICSharpCode.Decompiler
nuget Mono.Cecil
nuget Newtonsoft.Json
nuget FSharpLint.Core
nuget FSharp.Core content: none
nuget System.Configuration.ConfigurationManager
nuget Serilog
nuget Serilog.Sinks.File
Expand Down
80 changes: 43 additions & 37 deletions paket.lock
Expand Up @@ -36,22 +36,22 @@ NUGET
FSharp.Compiler.Service (>= 41.0.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net5.0)) (&& (== netstandard2.1) (>= net5.0))
FSharp.Core (>= 6.0.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net5.0)) (&& (== netstandard2.1) (>= net5.0))
McMaster.NETCore.Plugins (>= 1.4) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net5.0)) (&& (== netstandard2.1) (>= net5.0))
FSharp.Compiler.Service (43.7.200)
FSharp.Core (7.0.200)
FSharp.Compiler.Service (43.7.300)
FSharp.Core (7.0.300)
System.Buffers (>= 4.5.1)
System.Collections.Immutable (>= 6.0)
System.Diagnostics.DiagnosticSource (>= 6.0)
System.Memory (>= 4.5.5)
System.Reflection.Emit (>= 4.7)
System.Reflection.Metadata (>= 6.0)
System.Reflection.Metadata (>= 6.0.1)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
FSharp.Control.AsyncSeq (3.2.1)
FSharp.Core (>= 4.7.2)
Microsoft.Bcl.AsyncInterfaces (>= 5.0)
FSharp.Control.Reactive (5.0.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
FSharp.Core (>= 4.7.2)
System.Reactive (>= 5.0 < 6.0)
FSharp.Core (7.0.200) - content: none
FSharp.Core (7.0.300)
FSharp.Data.Adaptive (1.2.13)
FSharp.Core (>= 4.7)
System.Reflection.Emit.Lightweight (>= 4.6)
Expand Down Expand Up @@ -537,25 +537,32 @@ NUGET
System.Text.Encoding.CodePages (>= 6.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Text.Json (>= 6.0) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Threading.Tasks.Dataflow (>= 6.0) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
Microsoft.Build.Framework (17.4)
System.Security.Permissions (>= 6.0)
Microsoft.Build.Utilities.Core (17.2)
Microsoft.Build.Framework (>= 17.2)
Microsoft.NET.StringTools (>= 1.0)
Microsoft.Win32.Registry (>= 4.3)
System.Collections.Immutable (>= 5.0)
System.Configuration.ConfigurationManager (>= 4.7)
Microsoft.NET.StringTools (17.4)
System.Memory (>= 4.5.5)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
Microsoft.Build.Framework (17.6.3)
Microsoft.Win32.Registry (>= 5.0) - restriction: == net6.0
System.Security.Permissions (>= 7.0)
System.Security.Principal.Windows (>= 5.0) - restriction: == net6.0
Microsoft.Build.Utilities.Core (17.6.3)
Microsoft.Build.Framework (>= 17.6.3)
Microsoft.NET.StringTools (>= 17.6.3)
Microsoft.VisualStudio.Setup.Configuration.Interop (>= 3.2.2146) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
Microsoft.Win32.Registry (>= 5.0) - restriction: == net6.0
System.Collections.Immutable (>= 7.0)
System.Configuration.ConfigurationManager (>= 7.0)
System.Memory (>= 4.5.5) - restriction: || (== net6.0) (&& (== net7.0) (>= net472))
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net6.0) (&& (== net7.0) (>= net472))
System.Security.Permissions (>= 7.0)
System.Security.Principal.Windows (>= 5.0) - restriction: || (== net6.0) (&& (== net7.0) (>= net472))
System.Text.Encoding.CodePages (>= 7.0) - restriction: == net6.0
Microsoft.NET.StringTools (17.6.3)
Microsoft.VisualStudio.Setup.Configuration.Interop (3.6.2115) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
Microsoft.Win32.Registry (5.0)
System.Security.AccessControl (>= 5.0)
System.Security.Principal.Windows (>= 5.0)
Microsoft.Win32.SystemEvents (6.0.1) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
Microsoft.Win32.SystemEvents (7.0)
Mono.Posix.NETStandard (1.0)
MSBuild.StructuredLogger (2.1.768)
Microsoft.Build.Framework (>= 16.10)
Microsoft.Build.Utilities.Core (>= 16.10)
MSBuild.StructuredLogger (2.1.820)
Microsoft.Build.Framework (>= 17.5)
Microsoft.Build.Utilities.Core (>= 17.5)
Newtonsoft.Json (13.0.1)
NuGet.Common (6.3)
NuGet.Frameworks (>= 6.3)
Expand All @@ -573,39 +580,38 @@ NUGET
NuGet.Packaging (>= 6.3)
NuGet.Versioning (6.3)
Octokit (0.48)
System.Collections.Immutable (6.0)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
System.Configuration.ConfigurationManager (6.0)
System.Security.Cryptography.ProtectedData (>= 6.0)
System.Security.Permissions (>= 6.0)
System.Drawing.Common (6.0) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
Microsoft.Win32.SystemEvents (>= 6.0)
System.Collections.Immutable (7.0)
System.Configuration.ConfigurationManager (7.0)
System.Diagnostics.EventLog (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Security.Cryptography.ProtectedData (>= 7.0)
System.Security.Permissions (>= 7.0)
System.Diagnostics.EventLog (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Drawing.Common (7.0)
Microsoft.Win32.SystemEvents (>= 7.0)
System.Formats.Asn1 (6.0)
System.Memory (4.5.5) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Memory (4.5.5) - restriction: || (== net6.0) (&& (== net7.0) (>= net472))
System.Reactive (5.0)
System.Reflection.Metadata (6.0.1) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Collections.Immutable (>= 6.0)
System.Reflection.MetadataLoadContext (6.0) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Collections.Immutable (>= 6.0)
System.Reflection.Metadata (>= 6.0)
System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Security.AccessControl (6.0)
System.Runtime.CompilerServices.Unsafe (6.0)
System.Security.AccessControl (6.0) - restriction: == net6.0
System.Security.Cryptography.Cng (5.0)
System.Formats.Asn1 (>= 5.0)
System.Security.Cryptography.Pkcs (6.0.1)
System.Formats.Asn1 (>= 6.0)
System.Security.Cryptography.ProtectedData (6.0)
System.Security.Permissions (6.0) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Security.AccessControl (>= 6.0)
System.Windows.Extensions (>= 6.0)
System.Security.Cryptography.ProtectedData (7.0.1)
System.Security.Permissions (7.0)
System.Windows.Extensions (>= 7.0)
System.Security.Principal.Windows (5.0)
System.Text.Encoding.CodePages (6.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
System.Text.Encoding.CodePages (7.0)
System.Text.Encodings.Web (6.0) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
System.Text.Json (6.0.5) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
System.Text.Encodings.Web (>= 6.0)
System.Threading.Tasks.Dataflow (6.0) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Windows.Extensions (6.0) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= net7.0)) (== net7.0)
System.Drawing.Common (>= 6.0)
System.Windows.Extensions (7.0)
System.Drawing.Common (>= 7.0)
2 changes: 2 additions & 0 deletions src/FsAutoComplete.Core/FileSystem.fs
Expand Up @@ -526,6 +526,8 @@ type FileSystem(actualFs: IFileSystem, tryFindFile: string<LocalPath> -> Volatil

member _.AssemblyLoader = actualFs.AssemblyLoader

member _.ChangeExtensionShim(path: string, extension: string) : string = Path.ChangeExtension(path, extension)

module Symbol =
open FSharp.Compiler.Symbols

Expand Down
2 changes: 1 addition & 1 deletion src/FsAutoComplete.Core/UnionPatternMatchCaseGenerator.fs
Expand Up @@ -283,7 +283,7 @@ let private tryFindPatternMatchExprInParsedInput (pos: Position) (parsedInput: P
| SynExpr.ArbitraryAfterError(_debugStr, _range) -> None

| SynExpr.FromParseError(synExpr, _range)
| SynExpr.DiscardAfterMissingQualificationAfterDot(synExpr, _range) -> walkExpr synExpr
| SynExpr.DiscardAfterMissingQualificationAfterDot(synExpr, _, _range) -> walkExpr synExpr

| _ -> None)

Expand Down
6 changes: 3 additions & 3 deletions src/FsAutoComplete.Core/UntypedAstUtils.fs
Expand Up @@ -404,7 +404,7 @@ let internal getRangesAtPosition input (r: Position) : Range list =
addIfInside r
walkMeasure m
| SynExpr.Const(_, r) -> addIfInside r
| SynExpr.AnonRecd(isStruct, copyInfo, recordFields, r) -> addIfInside r
| SynExpr.AnonRecd(isStruct, copyInfo, recordFields, r, trivia) -> addIfInside r
| SynExpr.Sequential(seqPoint, isTrueSeq, expr1, expr2, r) -> ()
| SynExpr.Ident(_) -> ()
| SynExpr.LongIdent(isOptional, longDotId, altNameRefCell, r) -> addIfInside r
Expand All @@ -418,7 +418,7 @@ let internal getRangesAtPosition input (r: Position) : Range list =
| SynExpr.LibraryOnlyUnionCaseFieldSet(_, longId, _, _, r) -> addIfInside r
| SynExpr.ArbitraryAfterError(debugStr, r) -> addIfInside r
| SynExpr.FromParseError(expr, r) -> addIfInside r
| SynExpr.DiscardAfterMissingQualificationAfterDot(_, r) -> addIfInside r
| SynExpr.DiscardAfterMissingQualificationAfterDot(_, _, r) -> addIfInside r
| SynExpr.Fixed(expr, r) -> addIfInside r
| SynExpr.InterpolatedString(parts, kind, r) ->
addIfInside r
Expand Down Expand Up @@ -527,7 +527,7 @@ let internal getRangesAtPosition input (r: Position) : Range list =
| SynMemberDefn.Member(binding, r) ->
addIfInside r
walkBinding binding
| SynMemberDefn.ImplicitCtor(_, AllAttrs attrs, AllSimplePats pats, _, _, r) ->
| SynMemberDefn.ImplicitCtor(_, AllAttrs attrs, AllSimplePats pats, _, _, r, _) ->
addIfInside r
List.iter walkAttribute attrs
List.iter walkSimplePat pats
Expand Down
2 changes: 1 addition & 1 deletion test/FsAutoComplete.Tests.Lsp/CompletionTests.fs
Expand Up @@ -125,7 +125,7 @@ let tests state =

let completionParams: CompletionParams =
{ TextDocument = { Uri = Path.FilePathToUri path }
Position = { Line = 13; Character = 10 } // after Lis partial type name in Id record field declaration
Position = { Line = 11; Character = 10 } // after Lis partial type name in Id record field declaration
Context =
Some
{ triggerKind = CompletionTriggerKind.Invoked
Expand Down