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.

Sign up for GitHub

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 to 43.8.200 preview.23516.2 #1202

Merged
merged 10 commits into from
Nov 25, 2023
Merged

Update fcs to 43.8.200 preview.23516.2 #1202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a89e7cd
update FCS package to 43.8.200-preview.23516.2
dawedawe Nov 14, 2023
7ea80d4
add missing interface implementation for ISourceText.GetSubTextFromRange
dawedawe Nov 14, 2023
3c28570
And here we have 43.8.200-preview.23562.1
dawedawe Nov 14, 2023
774e69c
update to actions/setup-dotnet@v3
dawedawe Nov 14, 2023
2caf777
reuse IFSACSourceText.GetText
dawedawe Nov 14, 2023
ad242ff
fix loop in findConst
dawedawe Nov 16, 2023
f40ac2f
try if fantomas 6.2.3 makes a difference regarding the random formatt…
dawedawe Nov 16, 2023
848ce63
Merge branch 'nightly' into update_fcs_to_43.8.200-preview.23516.2
dawedawe Nov 16, 2023
c2eefdd
update build.yml for new fantomas version
dawedawe Nov 16, 2023
19a01c4
cat file
dawedawe Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"fantomas": {
"version": "6.2.2",
"version": "6.2.3",
"commands": [
"fantomas"
]
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ jobs:

# setup .NET per the repo global.json
- name: Setup .NET
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v3

# setup .NET per test session
- name: Setup .NET
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v3
with:
include-prerelease: ${{ matrix.include-prerelease }}
global-json-file: ${{ matrix.global-json-file }}
Expand All @@ -87,7 +87,10 @@ jobs:
run: |
# can't do a tool restore here due to an 8.0.100 rc2 bug - this is fixed in GA so can go back to
# dotnet tool restore then.
dotnet tool install paket --version 8.0.0-alpha002 && dotnet tool install fantomas --version 6.2.2 && dotnet paket restore
dotnet tool install paket --version 8.0.0-alpha002 && dotnet tool install fantomas --version 6.2.3 && dotnet paket restore
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now that GA has released we can probably remove this in favor of the 'normal' tool restore. I can look into that on main though.


- name: cat file
run: cat src/FsAutoComplete.Core/AbstractClassStubGenerator.fs

- name: Check format
run: dotnet build -t:CheckFormat
Expand Down
4 changes: 2 additions & 2 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ framework: netstandard2.0, netstandard2.1, net6.0, net7.0, net8.0

source https://api.nuget.org/v3/index.json
# this is the FCS nightly feed, re-enable at your own risk!
# source: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json
source: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json
#source: ./libs
storage: none
strategy: min
Expand All @@ -13,7 +13,7 @@ lowest_matching: true

nuget BenchmarkDotNet 0.13.5
nuget Fantomas.Client >= 0.9
nuget FSharp.Compiler.Service >= 43.8.100
nuget FSharp.Compiler.Service >= 43.8.200-preview.23562.1
nuget Ionide.ProjInfo >= 0.62.0
nuget Ionide.ProjInfo.FCS >= 0.62.0
nuget Ionide.ProjInfo.ProjectSystem >= 0.62.0
Expand Down
21 changes: 11 additions & 10 deletions paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,12 @@ NUGET
FSharp.Compiler.Service (>= 41.0.1) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net5.0)) (&& (== netstandard2.1) (>= net5.0))
FSharp.Core (>= 6.0.1) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net5.0)) (&& (== netstandard2.1) (>= net5.0))
McMaster.NETCore.Plugins (>= 1.4) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net5.0)) (&& (== netstandard2.1) (>= net5.0))
FSharp.Compiler.Service (43.8.100)
FSharp.Core (8.0.100)
System.Buffers (>= 4.5.1)
System.Collections.Immutable (>= 7.0)
System.Diagnostics.DiagnosticSource (>= 7.0.2)
System.Memory (>= 4.5.5)
System.Reflection.Emit (>= 4.7)
System.Reflection.Metadata (>= 7.0)
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) (== net8.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
FSharp.Core (>= 4.7.2)
System.Reactive (>= 5.0 < 6.0)
FSharp.Core (8.0.100)
FSharp.Data.Adaptive (1.2.13)
FSharp.Core (>= 4.7)
System.Reflection.Emit.Lightweight (>= 4.6)
Expand Down Expand Up @@ -489,6 +479,17 @@ NUGET
Expecto (>= 10.0 < 11.0) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
FSharp.Core (>= 7.0.200) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
System.Collections.Immutable (>= 6.0) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
remote: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json
FSharp.Compiler.Service (43.8.200-preview.23562.1)
FSharp.Core (8.0.200-beta.23562.1)
System.Buffers (>= 4.5.1)
System.Collections.Immutable (>= 7.0)
System.Diagnostics.DiagnosticSource (>= 7.0.2)
System.Memory (>= 4.5.5)
System.Reflection.Emit (>= 4.7)
System.Reflection.Metadata (>= 7.0)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
FSharp.Core (8.0.200-beta.23562.1)

GROUP Build
STORAGE: NONE
Expand Down
5 changes: 5 additions & 0 deletions src/FsAutoComplete.Core/FileSystem.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,11 @@ module RoslynSourceText =

member _.GetSubTextString(start, length) = sourceText.GetSubText(TextSpan(start, length)).ToString()

member x.GetSubTextFromRange(range: range) : string =
match (x :> IFSACSourceText).GetText(range) with
| Ok t -> t
| _ -> invalidArg (nameof range) "The range is outside the file boundaries"

member _.SubTextEquals(target, startIndex) =
if startIndex < 0 || startIndex >= sourceText.Length then
invalidArg "startIndex" "Out of range."
Expand Down
Loading