Skip to content

Sync with the ultimate master #1041

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 1 commit into from
Jan 14, 2026
Merged

Sync with the ultimate master #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Impl/FSharpImplUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,12 @@ public static string GetMfvCompiledName([NotNull] this FSharpMemberOrFunctionOrV

var isCompiled = typeElement is ICompiledTypeElement;
if (isCompiled)
return mfv.CompiledName;
{
var mfvCompiledName = mfv.CompiledName;
return mfv is { IsProperty: true, IsExtensionMember: false }
? mfvCompiledName.SubstringAfter("get_").SubstringAfter("set_")
: mfvCompiledName;
}

return mfv.LogicalName;
}
Expand Down
7 changes: 7 additions & 0 deletions ReSharper.FSharp/test/data/TestAssembliesSources/AbstractMembers/AbstractMembers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace global

type I1 =
abstract P1: int
abstract P2: int with get
abstract P3: int with set
abstract P4: int with get, set
15 changes: 15 additions & 0 deletions ReSharper.FSharp/test/data/TestAssembliesSources/AbstractMembers/AbstractMembers.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup>

<ItemGroup>
<Compile Include="AbstractMembers.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="FSharp.Core" Version="4.7.2" />
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions ReSharper.FSharp/test/data/TestAssembliesSources/TestAssembliesSources.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpClassLib", "FSharpCla
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ModuleMembers", "ModuleMembers\ModuleMembers.fsproj", "{51D06D99-4C39-4105-8DD0-55F2D1B1CC9E}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "AbstractMembers", "AbstractMembers\AbstractMembers.fsproj", "{78228E45-825D-43D8-A8EB-5D8D5916C2E2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|Any CPU = Release|Any CPU
Expand All @@ -35,5 +37,7 @@ Global
{E1848B22-15CE-48E5-9993-DF9DB033F45C}.Release|Any CPU.Build.0 = Release|Any CPU
{51D06D99-4C39-4105-8DD0-55F2D1B1CC9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{51D06D99-4C39-4105-8DD0-55F2D1B1CC9E}.Release|Any CPU.Build.0 = Release|Any CPU
{78228E45-825D-43D8-A8EB-5D8D5916C2E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{78228E45-825D-43D8-A8EB-5D8D5916C2E2}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
1 change: 1 addition & 0 deletions ReSharper.FSharp/test/data/features/quickFixes/generateMissingMembers/Object Expr 06.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ new I1{caret} }
6 changes: 6 additions & 0 deletions ReSharper.FSharp/test/data/features/quickFixes/generateMissingMembers/Object Expr 06.fs.gold
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{ new I1 with
member this.P1 = {selstart}failwith "todo"{selend}
member this.P2 = failwith "todo"
member this.P3 with set value = failwith "todo"
member this.P4 = failwith "todo"
member this.P4 with set value = failwith "todo" }
2 changes: 2 additions & 0 deletions ...FSharp/test/src/FSharp.Intentions.Tests/src/QuickFixes/GenerateInterfaceMembersFixTest.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ type GenerateMissingMembersFixTest() =
[<Test>] member x.``Object Expr 03``() = x.DoNamedTest()
[<Test>] member x.``Object Expr 04``() = x.DoNamedTest()
[<Test>] member x.``Object Expr 05``() = x.DoNamedTest()
[<TestReferenceProjectOutput("AbstractMembers")>]
[<Test>] member x.``Object Expr 06``() = x.DoNamedTest()

[<Test>] member x.``Partial type 01``() = x.DoNamedTest()

Expand Down
Loading