Skip to content

Sync with the ultimate master #1050

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

Merged
auduchinok merged 5 commits into from
Jan 27, 2026
Merged

Sync with the ultimate master #1050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
161f7a2
CPP-47650 Folding parity with Classic
jb-uta Jan 23, 2026
c7f669c
RIDER-134896 Completion: use global auto-import setting
auduchinok Jan 26, 2026
882d77d
misc rider-fsharp: correct the dependency on SNAPSHOT versions of rd-gen
ForNeVeR Jan 3, 2026
cc6c8ad
misc dotnet: update Rd to 2026.1.0
ForNeVeR Jan 21, 2026
693ccf6
misc resharper-oop: update Rd to 2026.1.1
ForNeVeR Jan 26, 2026
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
6 changes: 3 additions & 3 deletions ReSharper.FSharp/src/FSharp.Fantomas.Host/PackagesLock.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<PackageLock Include="Fantomas.Core" Version="7.0.3" />
<PackageLock Include="Fantomas.FCS" Version="7.0.3" />
<PackageLock Include="FSharp.Core" Version="9.0.201" />
<PackageLock Include="JetBrains.Lifetimes" Version="2025.3.1" />
<PackageLock Include="JetBrains.Lifetimes" Version="2026.1.1" />
<PackageLock Include="JetBrains.NuGet.Versioning" Version="7.0.20251126.165" />
<PackageLock Include="JetBrains.RdFramework" Version="2025.3.1" />
<PackageLock Include="JetBrains.RdFramework" Version="2026.1.1" />
<PackageLock Include="Microsoft.NETCore.Platforms" Version="3.1.0" />
<PackageLock Include="Microsoft.NETCore.Targets" Version="1.1.3" />
<PackageLock Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
Expand All @@ -15,4 +15,4 @@
<PackageLock Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
<PackageLock Include="System.Runtime.Loader" Version="4.3.0" />
</ItemGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions ReSharper.FSharp/src/FSharp.TypeProviders.Host/PackagesLock.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<PackageLock Include="FSharp.Core" Version="9.0.201" />
<PackageLock Include="JetBrains.Annotations" Version="2025.2.0" />
<PackageLock Include="JetBrains.FSharp.Compiler.Service" Version="2025.3.5.2" />
<PackageLock Include="JetBrains.Lifetimes" Version="2025.3.1" />
<PackageLock Include="JetBrains.RdFramework" Version="2025.3.1" />
<PackageLock Include="JetBrains.Lifetimes" Version="2026.1.1" />
<PackageLock Include="JetBrains.RdFramework" Version="2026.1.1" />
<PackageLock Include="Microsoft.NETCore.Platforms" Version="3.1.0" />
<PackageLock Include="Microsoft.NETCore.Targets" Version="1.1.3" />
<PackageLock Include="System.Diagnostics.Debug" Version="4.3.0" />
<PackageLock Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/Foldings/FSharpCodeFoldings.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,5 @@ type FSharpCodeFoldingProcess(logger: ILogger) =
[<Language(typeof<FSharpLanguage>)>]
type FSharpCodeFoldingProcessFactory(logger: ILogger) =
interface ICodeFoldingProcessorFactory with
member x.CreateProcessor() =
member x.CreateProcessor(settingsStore) =
FSharpCodeFoldingProcess(logger) :> _
1 change: 1 addition & 0 deletions ReSharper.FSharp/src/FSharp/FSharp.Psi.Services/src/Util/FSharpCodeCompletionContext.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ type FSharpCodeCompletionContext(context: CodeCompletionContext, fcsCompletionCo
let parameters = context.Parameters
(parameters.Multiplier <> 1 || parameters.EvaluationMode = EvaluationMode.Full) &&

context.ShowImportItemsInBasicCompletion() &&
not (FSharpCodeCompletionContext.isFullEvaluationDisabled context)

member val ParseAndCheckResults =
Expand Down
6 changes: 3 additions & 3 deletions ReSharper.FSharp/src/FSharp/PackagesLock.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<PackageLock Include="JetBrains.Build.Platform.DistributedCache" Version="1.1.20250717.260" />
<PackageLock Include="JetBrains.FSharp.Compiler.Service" Version="2025.3.5.2" />
<PackageLock Include="JetBrains.HabitatDetector" Version="1.4.5" />
<PackageLock Include="JetBrains.Lifetimes" Version="2025.3.1" />
<PackageLock Include="JetBrains.Lifetimes" Version="2026.1.1" />
<PackageLock Include="JetBrains.NuGet.Packaging" Version="7.0.20251126.165" />
<PackageLock Include="JetBrains.NuGet.Versioning" Version="7.0.20251126.165" />
<PackageLock Include="JetBrains.RdFramework" Version="2025.3.1" />
<PackageLock Include="JetBrains.RdFramework" Version="2026.1.1" />
<PackageLock Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="2.16.1" />
<PackageLock Include="Newtonsoft.Json" Version="13.0.3" />
<PackageLock Include="NVelocity" Version="1.0.3" />
<PackageLock Include="System.Collections.Immutable" Version="8.0.0" />
<PackageLock Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
</ItemGroup>
</Project>
</Project>
4 changes: 4 additions & 0 deletions ReSharper.FSharp/test/data/features/completion/filtered/Expr - Module 01.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// ${SHOW_IMPORT_ITEMS: false}
module Module

{caret}
Loading
Loading