AI/Junie: update context collection mechanism with new schema #940

DedSec256 · 2025-09-02T10:15:07Z

No description provided.

auduchinok · 2025-09-02T10:32:12Z

ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Impl/FSharpImplUtil.cs

+    public static string GetSourceName([CanBeNull] this IIdentifier identifier)
+    {
+      if (identifier == null) return SharedImplUtil.MISSING_DECLARATION_NAME;
+      return identifier.PrevSibling?.GetTokenType() == FSharpTokenType.QUOTE ? "'" + identifier.Name : identifier.Name;


I think it should be part of a IFSharpIdentifier implementation. We should probably not assume a particular tree structure here.

auduchinok · 2025-09-02T10:34:22Z

ReSharper.FSharp/test/src/FSharp.Tests/FSharp.Tests.fsproj

    <Compile Include="Refactorings\IntroduceVarTest.fs" />
    <Compile Include="Refactorings\InlineVarTest.fs" />
    <Compile Include="TypeProviders\PrimitiveTypesBoxerTest.fs" />
+    <Compile Include="AICore\FSharpFileSummarizerTest.fs" />


What does the Core part mean in the context of the plugin tests? Is it going to be somehow different from other AI features?

To be fair, this is a unit test that tests an implementation detail, not a feature

auduchinok · 2025-09-02T10:34:57Z

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/AICore/FSharpFileSummarizer.fs

+type private FileSummarizerVisitor() =
+    inherit TreeNodeVisitor<SummarizerContext>()
+
+    static let displayContext = emptyDisplayContext


Why is this binding needed?

It's just a single DisplayContext for the entire FileSummarizerVisitor implementation which currently uses the default context. If we want to change the default behavior, it will be enough to change this value, rather than replace all emptyDisplayContext in this implementation.

auduchinok · 2025-09-04T16:29:38Z

ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Impl/Tree/FSharpTypeDeclaration.cs

+        var members = TypeRepresentation switch
+        {
+          null => TypeMembersEnumerable,
+          IClassRepresentation classRepr => classRepr.TypeMembersEnumerable,
+          IInterfaceRepresentation interfaceRepr => interfaceRepr.TypeMembersEnumerable,
+          _ => TreeNodeEnumerable<ITypeBodyMemberDeclaration>.Empty
+        };


Do we need it as a part of PSI? Are there any other features, besides the AI summarization, that need it?

I thought it might be useful. It's not used anywhere else except AI right now.
It also complements the existing TypeInheritMember API (which also seems to be used in only one feature)

resharper-fsharp/ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Tree/IFSharpTypeOrExtensionDeclaration.cs

Lines 11 to 14 in e39c3ec

public partial interface IFSharpTypeDeclaration

{

[CanBeNull] ITypeInherit TypeInheritMember { get; }

}

resharper-fsharp/ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Impl/Tree/FSharpTypeDeclaration.cs

Lines 35 to 49 in e39c3ec

public ITypeInherit TypeInheritMember

{

get

{

ITypeInherit TryFindTypeInherit(TreeNodeEnumerable<ITypeBodyMemberDeclaration> memberDecls) =>

memberDecls.OfType<ITypeInherit>().SingleItem();

return TypeRepresentation switch

{

null => TryFindTypeInherit(TypeMembersEnumerable),

IClassRepresentation classRepr => TryFindTypeInherit(classRepr.TypeMembersEnumerable),

_ => null

};

}

}

But we can also leave it as the details of the AI Summarization implementation.

auduchinok · 2025-09-04T16:31:33Z

ReSharper.FSharp/test/data/ai/summarizer/Implementation file 01.fs

+    exception E1 of string
+        with member x.NewMessage = ""
+
+    type Record = {


Please try to split this file into multiple ones.

auduchinok · 2025-09-04T16:44:05Z

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/AICore/FSharpFileSummarizer.fs

+        let typeRepr = referencePat.GetFcsSymbol() |> formatFcsSymbolType
+        let representation = $"val {referencePat.GetFcsSymbol().DisplayName}: {typeRepr}"
+        context.AddEntity(binding, representation)


These tree lines are repeated several times, with the only difference being the representation string. Could you try extracting it?

In fact, in all three cases the common code consists only in calling

context.AddEntity(binding, representation)

The rest of the code constructs a different from each other representation

let typeRepr = referencePat.GetFcsSymbol() |> formatFcsSymbolType let representation = $"val {referencePat.GetFcsSymbol().DisplayName}: {typeRepr}" context.AddEntity(binding, representation)

let typeRepr = constructor.GetFcsSymbol() |> formatFcsSymbolType let representation = $"new: {typeRepr}" context.AddEntity(constructor, representation)

let representation = $"member {memberDecl.SourceName}: {typeRepr}" + accessors context.AddEntity(memberDecl, representation)

I'm not sure if there's anything can be done here, except to inline some variables.

auduchinok · 2025-09-04T16:44:47Z

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/AICore/FSharpFileSummarizer.fs

+
+    override x.VisitNamedModuleDeclaration(moduleDecl, context) =
+        // Currently, we're not adding a top-level module to the scope to not duplicate its name in tokens
+        context.AddEntity(moduleDecl, "module " + moduleDecl.ClrName)


Are we sure we want to use Clr name instead of the F# source name?

SourceName is not suitable, as we need a qualified name. Perhaps it's worth adding something like QualifiedName to INamedModuleDeclaration?

auduchinok · 2025-09-04T16:48:24Z

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/AICore/FSharpFileSummarizer.fs

+        use _ = context.OpenScope(interfaceImpl, $"interface {interfaceRepr}")
+        x.VisitNode(interfaceImpl, context)
+
+    override x.VisitTopBinding(binding, context) =


We should really try to fix the hierarchy instead of adding more repeating code like this :(

ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Impl/FSharpImplUtil.cs

^ Conflicts: ^ ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/AICore/FSharpFileSummarizer.fs

GitOrigin-RevId: 6d04adf # Conflicts: # dotnet/Plugins/resharper-fsharp/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/InferredTypeCodeVisionProvider.fs # dotnet/Plugins/resharper-fsharp/ReSharper.FSharp/src/FSharp/FSharp.Psi.Services/src/Util/FcsTypeUtil.fs GitOrigin-RevId: 68b10107ed9fc1f5e0a3bcadfa812d35f2d475cf

DedSec256 force-pushed the ber.a/summarizeJunie branch 2 times, most recently from e41f70a to 8870d07 Compare September 4, 2025 14:52

DedSec256 marked this pull request as ready for review September 4, 2025 15:32

DedSec256 requested a review from auduchinok September 4, 2025 15:49

auduchinok requested changes Sep 4, 2025

View reviewed changes

DedSec256 force-pushed the ber.a/summarizeJunie branch 3 times, most recently from fe6c6d6 to d9d5465 Compare September 8, 2025 15:27

DedSec256 added 5 commits September 22, 2025 14:57

wip

7006e12

^ Conflicts: ^ ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/AICore/FSharpFileSummarizer.fs

wip

12fc5f8

review fixes

5c92ca6

.

bb8feef

rebase fixes

ae951f8

DedSec256 force-pushed the ber.a/summarizeJunie branch from c1cc6aa to ae951f8 Compare September 22, 2025 12:45

DedSec256 merged commit 6d04adf into main Sep 22, 2025
1 check passed

DedSec256 deleted the ber.a/summarizeJunie branch September 23, 2025 15:05

	public partial interface IFSharpTypeDeclaration
	{
	[CanBeNull] ITypeInherit TypeInheritMember { get; }
	}

	public ITypeInherit TypeInheritMember
	{
	get
	{
	ITypeInherit TryFindTypeInherit(TreeNodeEnumerable<ITypeBodyMemberDeclaration> memberDecls) =>
	memberDecls.OfType<ITypeInherit>().SingleItem();

	return TypeRepresentation switch
	{
	null => TryFindTypeInherit(TypeMembersEnumerable),
	IClassRepresentation classRepr => TryFindTypeInherit(classRepr.TypeMembersEnumerable),
	_ => null
	};
	}
	}

AI/Junie: update context collection mechanism with new schema #940

AI/Junie: update context collection mechanism with new schema #940

Uh oh!

Conversation

DedSec256 commented Sep 2, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants