Psi/bind: check assembly-level AutoOpen namespaces

Author: auduchinok

ReSharper.FSharp/src/FSharp.Psi.Intentions/src/QuickFixes/ReplaceWithAbbreviatedTypeFix.fs

@@ -23,10 +23,6 @@ type ReplaceWithAbbreviatedTypeFix(error: TypeAbbreviationsCannotHaveAugmentatio
     override this.IsAvailable _ =
         isValid typeDecl &&
 
-        // todo: fix parameter list range
-        let typeParamDeclList = typeDecl.TypeParameterDeclarationList
-        (isNull typeParamDeclList || typeParamDeclList.TypeParametersEnumerable.IsEmpty()) &&
-
         let fcsEntity = typeDecl.GetFcsSymbol().As<FSharpEntity>()
         isNotNull fcsEntity
 

ReSharper.FSharp/src/FSharp.Psi.Services/src/Util/OpensUtil.fs

@@ -319,6 +319,8 @@ let addOpen (offset: DocumentOffset) (fsFile: IFSharpFile) (settings: IContextBo
     insertAfterAnchor ns anchor indent
 
 let addOpens (reference: FSharpSymbolReference) (typeElement: ITypeElement) =
+    if typeElement.IsAutoImported() then reference else
+
     let referenceOwner = reference.GetElement()
     use writeCookie = WriteLockCookie.Create(referenceOwner.IsPhysical())
 

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

@@ -7,12 +7,14 @@
 using JetBrains.Annotations;
 using JetBrains.Diagnostics;
 using JetBrains.Metadata.Reader.API;
+using JetBrains.ProjectModel;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Cache2;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Cache2.Compiled;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Cache2.Parts;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.DeclaredElement;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.DeclaredElement.CompilerGenerated;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Tree;
+using JetBrains.ReSharper.Plugins.FSharp.Psi.Metadata;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Parsing;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Tree;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Util;
@@ -690,6 +692,32 @@ public static bool MayHaveRequireQualifiedAccessAttribute([NotNull] this ITypeEl
     public static bool RequiresQualifiedAccess([NotNull] this ITypeElement typeElement) =>
       typeElement.GetAccessType() == ModuleMembersAccessKind.RequiresQualifiedAccess;
 
+    public static bool IsAutoImported([NotNull] this IClrDeclaredElement declaredElement)
+    {
+      var psiModule = declaredElement.Module;
+      var autoOpenCache = psiModule.GetSolution().GetComponent<FSharpAssemblyAutoOpenCache>();
+      var autoOpenedModules = autoOpenCache.GetAutoOpenedModules(psiModule);
+
+      // todo: assembly level auto open modules
+      var ns = GetNamespace(declaredElement);
+      return ns != null && autoOpenedModules.Contains(ns.QualifiedName);
+    }
+
+    [CanBeNull]
+    public static INamespace GetNamespace([NotNull] this IClrDeclaredElement declaredElement)
+    {
+      if (declaredElement is ITypeElement typeElement)
+        return typeElement.GetContainingNamespace();
+
+      if (declaredElement.GetContainingType() is { } containingType)
+        return containingType.GetContainingNamespace();
+
+      if (declaredElement is INamespace ns)
+        return ns.GetContainingNamespace();
+
+      return null;
+    }
+
     [CanBeNull]
     private static T GetOutermostNode<T, TMatchingNode>([CanBeNull] this T node, bool singleLevel = false)
       where T : class, ITreeNode

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

@@ -39,21 +39,6 @@ public static string SuggestShortReferenceName(IDeclaredElement declaredElement,
     public static string SuggestShortReferenceName(string sourceName, PsiLanguageType language) =>
       NamingManager.GetNamingLanguageService(language).MangleNameIfNecessary(sourceName);
 
-    [CanBeNull]
-    private static INamespace GetNamespace([NotNull] IClrDeclaredElement declaredElement)
-    {
-      if (declaredElement is ITypeElement typeElement)
-        return typeElement.GetContainingNamespace();
-
-      if (declaredElement.GetContainingType() is { } containingType)
-        return containingType.GetContainingNamespace();
-
-      if (declaredElement is INamespace ns)
-        return ns.GetContainingNamespace();
-
-      return null;
-    }
-
     private static bool RequiresFullyQualifiedName([NotNull] IReference reference)
     {
       // Can't insert 'open' before top-level module declaration.
@@ -67,7 +52,10 @@ private static void SetNamespaceQualifierIfNeeded([NotNull] FSharpSymbolReferenc
       if (!RequiresFullyQualifiedName(reference))
         return;
 
-      var ns = GetNamespace(declaredElement);
+      if (declaredElement.IsAutoImported())
+        return;
+
+      var ns = declaredElement.GetNamespace();
       if (ns == null || ns.IsRootNamespace)
         return;
 

ReSharper.FSharp/test/data/features/completion/Attribute - Top level module 01.fs

@@ -0,0 +1,3 @@
+// ${COMPLETE_ITEM:RequireQualifiedAccess}
+[<{caret}>]
+module M

ReSharper.FSharp/test/data/features/completion/Attribute - Top level module 01.fs.gold

@@ -0,0 +1,3 @@
+// ${COMPLETE_ITEM:RequireQualifiedAccess}
+[<RequireQualifiedAccess{caret}>]
+module M

ReSharper.FSharp/test/data/features/completion/Attribute - Top level module 02.fs

@@ -0,0 +1,3 @@
+// ${COMPLETE_ITEM:Extension (in System.Runtime.CompilerServices)}
+[<{caret}>]
+module M

ReSharper.FSharp/test/data/features/completion/Attribute - Top level module 02.fs.gold

@@ -0,0 +1,3 @@
+// ${COMPLETE_ITEM:Extension (in System.Runtime.CompilerServices)}
+[<System.Runtime.CompilerServices.Extension{caret}>]
+module M

ReSharper.FSharp/test/data/features/quickFixes/replaceWithAbbreviatedType/Type parameters 01.fs.gold

@@ -1,6 +1,4 @@
-open Microsoft.FSharp.Collections
-
-type list = list<int>
+type list = list<int>
 
 type List<'T>{caret} with
     member x.P = 1

ReSharper.FSharp/test/data/features/quickFixes/replaceWithAbbreviatedType/Type parameters 02.fs.gold

@@ -0,0 +1,2 @@
+type List{caret}<'T> with
+    member x.P = 1