Merge branch 'main' into ber.a/nowarn-warnon

Author: DedSec256

RELEASE_NOTES.md

@@ -1,5 +1,36 @@
 # Release notes
 
+## 2025.3
+
+2025.3
+
+Quick fixes:
+* Change type:
+    * The new quick fix allows changing declarations to fix type mismatch errors. It allows changing types of parameters, function return, fields, properties and so on. It integrates into the common logic in R#, so changing types is also possible between the languages.
+
+* Import:
+    * Module values and functions from compiled F# code can now be imported
+    * Static F# extension members can now be imported in code completion and quick fix
+    * Extension members can now be imported on F# short lambdas
+    * Extensions members are grouped by namespace, it's possible to choose which one to import
+
+* Generate overrides: import parameter types when needed
+* To mutable: implemented for structs and their fields
+
+Better AI support
+We've reimplemented context collection for Junie, so it can analyze F# code significantly better
+
+Analisys:
+* Update F# compiler service for F# 10 features
+* Infer the maximum supported language version in the used compiler and use it inside IDE
+
+Misc:
+* Improved support for F# short lambdas in refactorings like 'Introduce variable' and quick fixes
+* Typing assists: better 'Enter' implementation  for single-line type declarations and `if` expressions
+* Language injections: fix reading annotations in compiled F# properties, allow injecting F# with `fsharp` alias
+* Update Fantomas to 7.0.3
+
+
 ## 2025.2
 
 ### Import code completion and quick fixes

ReSharper.FSharp/src/FSharp.TypeProviders.Host/PackagesLock.targets

@@ -3,11 +3,12 @@
   <ItemGroup>
     <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.4" />
+    <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="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>

ReSharper.FSharp/src/FSharp/FSharp.Common/src/Shim/AssemblyReader/FcsModuleReaderCommonCache.fs

@@ -16,6 +16,7 @@ open JetBrains.Util.DataStructures
 type FcsModuleReaderCommonCache(lifetime: Lifetime, changeManager: ChangeManager) =
     inherit AssemblyReaderShimChangeListenerBase(lifetime, changeManager)
 
+    // todo: is it ever cleared?
     let assemblyTypeRefs = ConcurrentDictionary<IPsiModule, ConcurrentDictionary<IClrTypeName, ILTypeRef>>()
 
     member this.GetOrCreateAssemblyTypeRefCache(targetModule: IPsiModule) =

ReSharper.FSharp/src/FSharp/FSharp.Common/src/Shim/AssemblyReader/ProjectFcsModuleReader.fs

@@ -1342,6 +1342,9 @@ type ProjectFcsModuleReader(psiModule: IPsiModule, cache: FcsModuleReaderCommonC
         timestamp <- DateTime.UtcNow
         shim.Logger.Trace("New timestamp: {0}: {1}", path, timestamp)
 
+    member this.GetFcsIlType(t: IType) =
+        mkType t
+
     interface IProjectFcsModuleReader with
         member this.ILModuleDef =
             FSharpAsyncUtil.CheckAndThrow()

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/CodeCompletion/FSharpScriptReferenceCompletionProvider.fs

@@ -83,7 +83,11 @@ type FSharpScriptReferenceCompletionContextProvider() =
         let caretValueOffset = caretOffset - argOffset - startQuoteLength
         let prefixValue = argValue.Substring(0, caretValueOffset)
         let supportsNuget =
-            match hashDirective.HashToken.GetText() with
+            match hashDirective.HashToken with
+            | null -> false
+            | hashToken ->
+
+            match hashToken.GetText() with
             | "#r" | "#reference" -> "nuget:".StartsWith(prefixValue.TrimStart([|' '|]))
             | _ -> false
 

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/CodeCompletion/Rules/FSharpKeywordsRule.fs

@@ -14,6 +14,7 @@ open JetBrains.ReSharper.Feature.Services.CodeCompletion.Settings
 open JetBrains.ReSharper.Feature.Services.Lookup
 open JetBrains.RdBackend.Common.Features.Completion
 open JetBrains.ReSharper.Plugins.FSharp
+open JetBrains.ReSharper.Plugins.FSharp.ProjectModel
 open JetBrains.ReSharper.Plugins.FSharp.Psi
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.CodeCompletion
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Util
@@ -301,11 +302,12 @@ module FSharpKeywordsProvider =
 type FSharpKeywordsRule() =
     inherit ItemsProviderOfSpecificContext<FSharpCodeCompletionContext>()
 
-    let hashDirectives =
-        [| KeywordSuffix.Quotes, [| "#load"; "#r"; "#I"; "#nowarn"; "#warnon"; "#time" |]
+    let hashDirectives isFSharp9Supported =
+        let spaceOrQuotesSuffix = if isFSharp9Supported then KeywordSuffix.Space else KeywordSuffix.Quotes
+
+        [| spaceOrQuotesSuffix, [| "#nowarn"; "#warnon"; "#time" |]
+           KeywordSuffix.Quotes, [| "#load"; "#r"; "#I" |]
            KeywordSuffix.None, [| "#if"; "#else"; "#endif" |] |]
-        |> Array.map (fun (suffix, directives) -> directives |> Array.map (fun d -> d, suffix))
-        |> Array.concat
 
     let scriptKeywords =
         [| "__SOURCE_DIRECTORY__"
@@ -374,10 +376,12 @@ type FSharpKeywordsRule() =
                 item.InitializeRanges(context.Ranges, context.BasicContext)
                 collector.Add(item)
 
-        for keyword, suffix in hashDirectives do
-            let item = FSharpHashDirectiveLookupItem(keyword, suffix)
-            item.InitializeRanges(context.Ranges, context.BasicContext)
-            collector.Add(item)
+        let isFSharp9Supported = FSharpLanguageLevel.isFSharp90Supported context.BasicContext.File
+        for suffix, keywords in hashDirectives isFSharp9Supported do
+            for keyword in keywords do
+                let item = FSharpHashDirectiveLookupItem(keyword, suffix)
+                item.InitializeRanges(context.Ranges, context.BasicContext)
+                collector.Add(item)
 
         true
 

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/CodeCompletion/Rules/ImportModuleMemberRule.fs

@@ -16,6 +16,7 @@ open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.CodeCompletion
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Util
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Impl
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Resolve
+open JetBrains.ReSharper.Plugins.FSharp.Psi.Services.Util
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Services.Util.FSharpCompletionUtil
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Util
@@ -96,7 +97,7 @@ type ImportModuleMemberRule() =
             match referenceContext.Value with
             | FSharpReferenceContext.Expression ->
                 let treeNode = reparsedContext.TreeNode
-                context.GetOrCreateDataUnderLock(LocalValuesRule.valuesKey, treeNode, LocalValuesRule.getLocalValues)
+                context.GetOrCreateDataUnderLock(LocalValuesUtil.valuesKey, treeNode, LocalValuesUtil.getLocalValues)
 
             | _ -> EmptyDictionary.Instance
 

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/CodeCompletion/Rules/LocalValuesRule.fs

@@ -1,8 +1,6 @@
 namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features.CodeCompletion.Rules
 
-open System.Collections.Generic
 open FSharp.Compiler.CodeAnalysis
-open JetBrains.Application
 open JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure
 open JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure.AspectLookupItems.BaseInfrastructure
 open JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure.AspectLookupItems.Behaviors
@@ -13,12 +11,11 @@ open JetBrains.ReSharper.Plugins.FSharp.Psi
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.CodeCompletion
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Util
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Util.FcsTypeUtil
+open JetBrains.ReSharper.Plugins.FSharp.Psi.Services.Util
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
 open JetBrains.ReSharper.Plugins.FSharp.Util
 open JetBrains.ReSharper.Psi
-open JetBrains.ReSharper.Psi.Tree
 open JetBrains.UI.RichText
-open JetBrains.Util
 
 type FcsSymbolInfo(text, symbolUse: FSharpSymbolUse) =
     inherit TextualInfo(text, text)
@@ -31,116 +28,6 @@ type FcsSymbolInfo(text, symbolUse: FSharpSymbolUse) =
         member this.FcsSymbolUse = symbolUse
         member this.NamespaceToOpen = [||]
 
-module rec LocalValuesRule =
-    let valuesKey = Key<IDictionary<string, FSharpSymbolUse>>(nameof LocalValuesRule)
-
-    let getLocalValues (context: ITreeNode) : IDictionary<_, _> =
-        let values = Dictionary<string, FSharpSymbolUse>()
-
-        let addValue (decl: IFSharpDeclaration) =
-            let sourceName = decl.SourceName
-            if sourceName <> "_" then
-                values.TryAdd(sourceName, decl.GetFcsSymbolUse()) |> ignore
-
-        let addPatternValues (pat: IFSharpPattern) =
-            if isNull pat then () else
-
-            for declPattern in pat.Declarations do
-                let pat = declPattern.As<IFSharpPattern>()
-                if pat.IsDeclaration then
-                    addValue declPattern
-
-        let addLetBindingsValues (letBindings: ILetBindings) =
-            for otherBinding in letBindings.Bindings do
-                addPatternValues otherBinding.HeadPattern
-
-        let addSelfIdValue (selfId: ISelfId) =
-            if isNotNull selfId then
-                addValue selfId
-
-        let addMembersValues (contextOffset: int) (members: ITreeNode seq) =
-            let members = members |> Seq.takeWhile (fun m -> m.GetTreeStartOffset().Offset < contextOffset)
-
-            for otherMember in members do
-                match otherMember with
-                | :? ILetBindings as letBindings ->
-                    for binding in letBindings.Bindings do
-                        addPatternValues binding.HeadPattern
-
-                | _ -> ()
-
-        for parentNode in context.ContainingNodes() do
-            Interruption.Current.CheckAndThrow()
-
-            match parentNode with
-            | :? IMatchClause as matchClause ->
-                addPatternValues matchClause.Pattern
-
-            | :? IBinding as binding ->
-                Seq.iter addPatternValues binding.ParameterPatterns
-
-                let letBindings = LetBindingsNavigator.GetByBinding(binding)
-                if isNotNull letBindings && letBindings.IsRecursive then
-                    addLetBindingsValues letBindings
-
-            | :? IAccessorDeclaration as decl ->
-                Seq.iter addPatternValues decl.ParameterPatternsEnumerable
-
-            | :? IFSharpTypeDeclaration as typeDecl ->
-                let ctorDecl = typeDecl.PrimaryConstructorDeclaration
-                if isNotNull ctorDecl then
-                    addPatternValues ctorDecl.ParameterPatterns
-                    addSelfIdValue ctorDecl.SelfIdentifier
-
-            | :? IFSharpExpression as expr ->
-                let letExpr = LetOrUseExprNavigator.GetByInExpression(expr)
-                if isNotNull letExpr then
-                    addLetBindingsValues letExpr
-
-                match expr with
-                | :? ILambdaExpr as lambdaExpr ->
-                    for pattern in lambdaExpr.PatternsEnumerable do
-                        addPatternValues pattern
-
-                | :? IForEachExpr as forExpr ->
-                    addPatternValues forExpr.Pattern
-
-                | :? IForExpr as forExpr ->
-                    addValue forExpr.Identifier
-
-                | _ -> ()
-
-            | :? IModuleMember as moduleMember ->
-                let moduleDecl = ModuleLikeDeclarationNavigator.GetByMember(moduleMember)
-                if isNotNull moduleDecl then
-                    let isRecursive =
-                        match moduleDecl with
-                        | :? IDeclaredModuleLikeDeclaration as moduleDecl -> moduleDecl.IsRecursive
-                        | _ -> false
-
-                    let contextOffset =
-                        if isRecursive then moduleDecl.GetTreeEndOffset() else moduleMember.GetTreeStartOffset()
-
-                    addMembersValues contextOffset.Offset (moduleDecl.MembersEnumerable |> Seq.cast)
-
-                let typeDecl = FSharpTypeDeclarationNavigator.GetByTypeMember(moduleMember.As())
-                if isNotNull typeDecl then
-                    addMembersValues (moduleMember.GetTreeStartOffset().Offset) (typeDecl.TypeMembersEnumerable |> Seq.cast)
-
-            | :? ITypeBodyMemberDeclaration as typeMember ->
-                let typeDecl = FSharpTypeDeclarationNavigator.GetByTypeMember(typeMember)
-                if isNotNull typeDecl then
-                    addMembersValues (typeMember.GetTreeStartOffset().Offset) (typeDecl.TypeMembersEnumerable |> Seq.cast)
-
-                let memberDecl = typeMember.As<IMemberDeclaration>()
-                if isNotNull memberDecl then
-                    addSelfIdValue memberDecl.SelfId
-                    Seq.iter addPatternValues memberDecl.ParameterPatterns
-
-            | _ -> ()
-
-        values
-
 [<Language(typeof<FSharpLanguage>)>]
 type LocalValuesRule() =
     inherit ItemsProviderOfSpecificContext<FSharpCodeCompletionContext>()
@@ -157,9 +44,9 @@ type LocalValuesRule() =
     override this.AddLookupItems(context, collector) =
         let values =
             let treeNode = context.ReparsedContext.TreeNode
-            context.GetOrCreateDataUnderLock(LocalValuesRule.valuesKey, treeNode, LocalValuesRule.getLocalValues)
+            context.GetOrCreateDataUnderLock(LocalValuesUtil.valuesKey, treeNode, LocalValuesUtil.getLocalValues)
 
-        for KeyValue(name, fcsSymbolUse) in values do
+        for KeyValue(name, (_, fcsSymbolUse)) in values do
             let icon = if isNull fcsSymbolUse then null else getIconId fcsSymbolUse.Symbol
 
             let info = FcsSymbolInfo(name, fcsSymbolUse, Ranges = context.Ranges)
@@ -181,7 +68,7 @@ type LocalValuesRule() =
         false
 
     override this.TransformItems(context, collector) =
-        let values = context.GetData(LocalValuesRule.valuesKey)
+        let values = context.GetData(LocalValuesUtil.valuesKey)
         if isNull values then () else
 
         collector.RemoveWhere(fun item ->

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/Debugger/FSharpDebuggerLocalSymbolProvider.fs

@@ -1,79 +1,25 @@
 namespace JetBrains.ReSharper.Plugins.FSharp.Services.Debugger
 
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.Text
-open JetBrains.DocumentModel
 open JetBrains.ReSharper.Feature.Services.Debugger
 open JetBrains.ReSharper.Plugins.FSharp.Psi
+open JetBrains.ReSharper.Plugins.FSharp.Psi.Services.Util
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
-open JetBrains.ReSharper.Plugins.FSharp.Util
 open JetBrains.ReSharper.Psi
 open JetBrains.ReSharper.Psi.Tree
 
 [<Language(typeof<FSharpLanguage>)>]
-type FSharpDebuggerLocalSymbolProvider() =
+type FSharpDebuggerLocalSymbolProvider2() =
     interface IDebuggerLocalSymbolProvider with
-        member x.FindLocalDeclarationAt(file: IFile, range: DocumentRange, name: string) =
-            match file.AsFSharpFile() with
-            | null -> null, null
-            | fsFile ->
-
-            match fsFile.ParseTree with
-            | None -> null, null
-            | Some parseTree ->
-
-            let pos = getPosFromDocumentOffset range.EndOffset
-            let mutable declRange = None
-
-            let visitor =
-                let inline (|SuitableIdent|_|) (ident: Ident) =
-                    if ident.idText = name && (Position.posLt ident.idRange.End pos || Position.posEq ident.idRange.End pos) then
-                        Some ident.idRange
-                    else None
-
-                let updateDeclRange (range: Range) =
-                    match declRange with
-                    | None ->
-                        declRange <- Some range
-                    | Some oldDeclRange when Position.posGt range.Start oldDeclRange.Start ->
-                        declRange <- Some range
-                    | _ -> ()
-
-                let visitPat pat defaultTraverse =
-                    match pat with
-                    | SynPat.Named(SynIdent(SuitableIdent range, _), false, _, _) -> updateDeclRange range
-                    | _ -> ()
-                    defaultTraverse pat
-
-                { new SyntaxVisitorBase<_>() with
-                    member this.VisitExpr(_, traverseSynExpr, defaultTraverse, expr) =
-                        match expr with
-                        | SynExpr.For(ident = SuitableIdent range) -> updateDeclRange range
-                        | SynExpr.ForEach(pat = pat) -> visitPat pat ignore
-                        | SynExpr.App(argExpr = SynExpr.Ident (SuitableIdent range)) -> updateDeclRange range
-                        | _ -> ()
-                        defaultTraverse expr
-
-                    member this.VisitPat(_, defaultTraverse, pat) = visitPat pat defaultTraverse
-
-                    member this.VisitLetOrUse(_, _, _, bindings, range) =
-                        bindings |> List.tryPick (fun (SynBinding(headPat = headPat)) ->
-                            visitPat headPat (fun _ -> None))
-
-                    member this.VisitMatchClause(_, defaultTraverse, (SynMatchClause(pat, _, _, _, _, _) as clause)) =
-                        visitPat pat (fun _ -> None) |> Option.orElseWith (fun _ -> defaultTraverse clause) }
-
-            SyntaxTraversal.Traverse(pos, parseTree, visitor) |> ignore
-
-            match declRange with
-            | Some declRange ->
-                let endOffset = getTreeEndOffset range.Document declRange
-                let treeNode = fsFile.FindTokenAt(endOffset - 1)
-                match treeNode.GetContainingNode<IFSharpDeclaration>() with
-                | null -> treeNode, null
-                | declaration -> treeNode, declaration.DeclaredElement
-
-            | None -> null, null
-
-        member x.FindContainingFunctionDeclarationBody(treeNode) =
-            treeNode // todo: refactor to get tree node instead of function declaration in SDK
+        member this.FindLocalDeclarationAt(file, range, name) =
+            let token = file.FindTokenAt(range.StartOffset)
+            if isNull token then null, null else
+
+            let values = LocalValuesUtil.getLocalValues token
+            match values.TryGetValue(name) with
+            | false, _ -> null, null
+            | true, (decl, _) -> decl, decl.DeclaredElement
+
+        member this.FindContainingFunctionDeclarationBody(node) =
+            match node.GetContainingNode<IChameleonExpression>() with
+            | null -> node.GetContainingFile()
+            | chameleonExpr -> chameleonExpr