wip

JetBrains · Feb 13, 2025 · d5d6089 · d5d6089
1 parent 4b4ae9d
commit d5d6089
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/PatternTypeHintsStage.fs b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/PatternTypeHintsStage.fs
@@ -175,7 +175,7 @@ type private PatternsHighlightingProcess(fsFile, settingsStore: IContextBoundSet
             if isNull symbol then ValueNone else
 
             let fcsType = symbol.FullType
-            let pattern, fcsType = fixIfOptionalParameter refPat fcsType
+            let pattern, fcsType = tryGetOuterOptionalParameterAndItsType refPat fcsType
             let range = pattern.GetNavigationRange().EndOffsetRange()
 
             createTypeHintHighlighting fcsType defaultDisplayContext range pushToHintMode actionsProvider false

diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Intentions/src/Intentions/AnnotationActions.fs b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Intentions/src/Intentions/AnnotationActions.fs
@@ -50,10 +50,10 @@ module SpecifyTypes =
         parenPat.SetPattern(pattern) |> ignore
         parenPat :> IFSharpPattern
 
-    let specifyPattern displayContext (fcsType: FSharpType) (pattern: IFSharpPattern) =
+    let specifyPatternType displayContext (fcsType: FSharpType) (pattern: IFSharpPattern) =
         let pattern, fcsType =
             match pattern with
-            | :? IReferencePat as pattern -> FcsTypeUtil.fixIfOptionalParameter pattern fcsType
+            | :? IReferencePat as pattern -> FcsTypeUtil.tryGetOuterOptionalParameterAndItsType pattern fcsType
             | _ -> pattern, fcsType
 
         let pattern = pattern.IgnoreParentParens()
@@ -107,7 +107,7 @@ type FunctionAnnotationAction(dataProvider: FSharpContextActionDataProvider) =
                 | TupleLikePattern pat when isTopLevel ->
                     specifyParameterTypes fcsType.GenericArguments pat.Patterns false
                 | pattern ->
-                    SpecifyTypes.specifyPattern displayContext fcsType pattern
+                    SpecifyTypes.specifyPatternType displayContext fcsType pattern
 
         specifyParameterTypes types parameters true
 
@@ -186,4 +186,4 @@ type PatternAnnotationAction(dataProvider: FSharpContextActionDataProvider) =
         let mfv = symbolUse.Symbol :?> FSharpMemberOrFunctionOrValue
         let displayContext = symbolUse.DisplayContext
 
-        SpecifyTypes.specifyPattern displayContext mfv.FullType pattern
+        SpecifyTypes.specifyPatternType displayContext mfv.FullType pattern
diff --git a/...per.FSharp/src/FSharp/FSharp.Psi.Intentions/src/QuickFixes/SpecifyParameterBaseTypeFix.fs b/...per.FSharp/src/FSharp/FSharp.Psi.Intentions/src/QuickFixes/SpecifyParameterBaseTypeFix.fs
@@ -122,7 +122,7 @@ type SpecifyParameterBaseTypeFix(refExpr: IReferenceExpr, typeUsage: ITypeUsage)
         use writeCookie = WriteLockCookie.Create(pat.IsPhysical())
 
         let baseType, displayContext = baseType.Value
-        SpecifyTypes.specifyPattern displayContext baseType pat
+        SpecifyTypes.specifyPatternType displayContext baseType pat
 
     override this.Execute(solution, textControl) =
         let fcsEntity, displayContext = getFcsEntity typeUsage |> Option.get

diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Intentions/src/QuickFixes/SpecifyParameterTypeFix.fs b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Intentions/src/QuickFixes/SpecifyParameterTypeFix.fs
@@ -81,7 +81,7 @@ type SpecifyParameterTypeFix(qualifiedExpr: IQualifiedExpr) =
 
     override this.SpecifyType(decl, mfv, d) =
         let decl = decl :?> ILocalReferencePat
-        SpecifyTypes.specifyPattern d mfv.FullType decl
+        SpecifyTypes.specifyPatternType d mfv.FullType decl
 
 
 type SpecifyPropertyTypeFix(qualifiedExpr: IQualifiedExpr) =

diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Services/src/Util/FcsTypeUtil.fs b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Services/src/Util/FcsTypeUtil.fs
@@ -22,7 +22,7 @@ let getFunctionTypeArgs includeReturnType fcsType =
 
     loop fcsType [] |> List.rev
 
-let fixIfOptionalParameter (pattern: IReferencePat) fcsType =
+let tryGetOuterOptionalParameterAndItsType (pattern: IReferencePat) fcsType =
     let optionalValPat = OptionalValPatNavigator.GetByPattern(pattern)
     if isNotNull optionalValPat && isOption fcsType then (optionalValPat : IFSharpPattern), fcsType.GenericArguments[0]
     else pattern, fcsType