Wip

JetBrains · Sep 27, 2022 · 916adf4 · 916adf4
1 parent 4866f85
commit 916adf4
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/ReSharper.FSharp/src/FSharp.Psi/src/Resolve/FSharpParameterUtil.cs b/ReSharper.FSharp/src/FSharp.Psi/src/Resolve/FSharpParameterUtil.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using FSharp.Compiler.Symbols;
 using JetBrains.Annotations;
-using JetBrains.DocumentModel;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Impl;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Tree;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Util;
@@ -70,7 +69,7 @@ private static IDeclaredElement GetFieldDeclaredElement([NotNull] IReference ref
       return field?.GetDeclaredElement(referenceOwner.GetPsiModule(), referenceOwner);
     }
 
-    public static IReadOnlyList<IReadOnlyList<(string name, DocumentRange range)>> GetParametersGroupNames(ITreeNode node) =>
+    public static IReadOnlyList<IReadOnlyList<(string name, ITreeNode node)>> GetParametersGroupNames(ITreeNode node) =>
       (node switch
       {
         IBinding binding => binding.Expression is ILambdaExpr lambda
@@ -91,12 +90,15 @@ private static IDeclaredElement GetFieldDeclaredElement([NotNull] IReference ref
         IMemberSignature memberSignature => GetParameterNames(((IMemberSignatureOrDeclaration)memberSignature)
           .ReturnTypeInfo.ReturnType),
 
-        IUnionCaseDeclaration ucDecl => new[] { ucDecl.Fields.Select(t => t.SourceName) },
+        IUnionCaseDeclaration ucDecl => new[] { ucDecl.Fields.Select(t => (t.SourceName, (ITreeNode)t)) },
 
         IFSharpTypeDeclaration { TypeRepresentation: IDelegateRepresentation repr } =>
           GetParameterNames(repr.TypeUsage),
 
-        _ => EmptyList<string[]>.Enumerable
+        IFSharpTypeDeclaration { PrimaryConstructorDeclaration: { } constructor } =>
+          GetParametersGroupNames(constructor),
+
+        _ => EmptyList<IEnumerable<(string, ITreeNode)>>.Enumerable
       })
       .Select(t => t.ToIReadOnlyList())
       .ToIReadOnlyList();
@@ -109,7 +111,7 @@ private static IDeclaredElement GetFieldDeclaredElement([NotNull] IReference ref
       _ => false
     };
 
-    private static IEnumerable<IEnumerable<(string, DocumentRange)>> GetLambdaArgs(ILambdaExpr expr)
+    private static IEnumerable<IEnumerable<(string, ITreeNode)>> GetLambdaArgs(ILambdaExpr expr)
     {
       var lambdaParams = expr.Patterns;
       var parameters = lambdaParams.Select(GetParameterNames);
@@ -118,28 +120,28 @@ private static IDeclaredElement GetFieldDeclaredElement([NotNull] IReference ref
       return parameters;
     }
 
-    public static IEnumerable<(string, DocumentRange)> GetParameterNames(this IFSharpPattern pattern)
+    public static IEnumerable<(string, ITreeNode)> GetParameterNames(this IFSharpPattern pattern)
     {
-      IEnumerable<(string, DocumentRange)> GetParameterNamesInternal(IFSharpPattern pat, bool isTopLevelParameter)
+      IEnumerable<(string, ITreeNode)> GetParameterNamesInternal(IFSharpPattern pat, bool isTopLevelParameter)
       {
         pat = pat.IgnoreInnerParens();
         return pat switch
         {
-          ILocalReferencePat local => new[] { (local.SourceName, local.GetDocumentRange()) },
+          ILocalReferencePat local => new[] { (local.SourceName, (ITreeNode)local) },
           IOptionalValPat opt => GetParameterNamesInternal(opt.Pattern, isTopLevelParameter),
           ITypedPat typed => GetParameterNamesInternal(typed.Pattern, false),
           IAttribPat attrib => GetParameterNamesInternal(attrib.Pattern, false),
           IAsPat asPat => GetParameterNamesInternal(asPat.RightPattern, false),
           ITuplePat tuplePat when isTopLevelParameter =>
             tuplePat.PatternsEnumerable.SelectMany(t => GetParameterNamesInternal(t, false)),
-          _ => new[] { (SharedImplUtil.MISSING_DECLARATION_NAME, DocumentRange.InvalidRange) }
+          var x => new[] { (SharedImplUtil.MISSING_DECLARATION_NAME, (ITreeNode)x) }
         };
       }
 
       return GetParameterNamesInternal(pattern, true);
     }
 
-    public static IEnumerable<IEnumerable<(string, DocumentRange)>> GetParameterNames(this ITypeUsage pattern) =>
+    public static IEnumerable<IEnumerable<(string, ITreeNode)>> GetParameterNames(this ITypeUsage pattern) =>
       pattern switch
       {
         IParenTypeUsage parenUsage => GetParameterNames(parenUsage.InnerTypeUsage),
@@ -150,17 +152,17 @@ private static IDeclaredElement GetFieldDeclaredElement([NotNull] IReference ref
             new[]
             {
               local.Identifier is { } identifier
-                ? (identifier.Name, local.GetDocumentRange())
-                : (SharedImplUtil.MISSING_DECLARATION_NAME, DocumentRange.InvalidRange)
+                ? (identifier.Name, (ITreeNode)local)
+                : (SharedImplUtil.MISSING_DECLARATION_NAME, null)
             }
           },
         IFunctionTypeUsage funPat =>
           GetParameterNames(funPat.ArgumentTypeUsage).Union(GetParameterNames(funPat.ReturnTypeUsage)),
         ITupleTypeUsage tuplePat => tuplePat.Items.SelectMany(GetParameterNames),
-        _ => EmptyList<IEnumerable<(string, DocumentRange)>>.Enumerable
+        _ => EmptyList<IEnumerable<(string, ITreeNode)>>.Enumerable
       };
 
-    public static IReadOnlyList<IReadOnlyList<(string, DocumentRange)>> GetParametersGroups(this IBinding binding)
+    public static IReadOnlyList<IReadOnlyList<(string, ITreeNode)>> GetParametersGroups(this IBinding binding)
     {
       var parameters = binding.ParameterPatterns.Select(GetParameterNames);
       var bodyExpr = binding.Expression;