Psi/types: use module for symbol scope context

Author: auduchinok

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

@@ -466,7 +466,7 @@ type ProjectFcsModuleReader(psiModule: IPsiModule, cache: FcsModuleReaderCommonC
                 mkType declaredType ]
 
     let mkCompilerGeneratedAttribute (attrTypeName: IClrTypeName) (args: ILAttribElem list): ILAttribute option =
-        let attrType = TypeFactory.CreateTypeByCLRName(attrTypeName, NullableAnnotation.Unknown, psiModule)
+        let attrType = TypeFactory.CreateTypeByCLRName(attrTypeName, psiModule, true)
 
         match attrType.GetTypeElement() with
         | null -> None

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

@@ -29,7 +29,7 @@ public FSharpAttributeInstance(FSharpAttribute attr, IPsiModule module)
     public string GetAttributeShortName() => Attr.AttributeType.DisplayName;
 
     // todo: containing type type parameters?
-    public IDeclaredType GetAttributeType() => TypeFactory.CreateTypeByCLRName(Attr.GetClrName(), Module);
+    public IDeclaredType GetAttributeType() => TypeFactory.CreateTypeByCLRName(Attr.GetClrName(), Module, true);
 
     private AttributeValue GetArgValue(Tuple<FSharpType, object> arg) =>
       new(ConstantValue.Create(arg.Item2, arg.Item1.MapType(EmptyList<ITypeParameter>.Instance, Module)));

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

@@ -30,7 +30,7 @@ public FSharpProvidedAttributeInstance(RdCustomAttributeData data, IPsiModule mo
 
     public string GetAttributeShortName() => myClrTypeName.ShortName;
 
-    public IDeclaredType GetAttributeType() => TypeFactory.CreateTypeByCLRName(myData.FullName, myModule);
+    public IDeclaredType GetAttributeType() => TypeFactory.CreateTypeByCLRName(myData.FullName, myModule, true);
 
     public AttributeValue PositionParameter(int paramIndex) =>
       paramIndex < PositionParameterCount
@@ -66,14 +66,14 @@ public IEnumerable<Pair<string, AttributeValue>> NamedParameters() => myData.Nam
 
     private AttributeValue ConvertToAttributeValue(RdAttributeArg arg)
     {
-      var elementType = TypeFactory.CreateTypeByCLRName(arg.TypeName, myModule);
+      var elementType = TypeFactory.CreateTypeByCLRName(arg.TypeName, myModule, true);
 
       if (!arg.IsArray) return new AttributeValue(ConstantValue.Create(arg.Unbox(), elementType));
 
       var arrayType = TypeFactory.CreateArrayType(elementType, 1, NullableAnnotation.Unknown);
       return new AttributeValue(arrayType, arg.Values
         .Select(t =>
-          new AttributeValue(ConstantValue.Create(t.Unbox(), TypeFactory.CreateTypeByCLRName(t.TypeName, myModule))))
+          new AttributeValue(ConstantValue.Create(t.Unbox(), TypeFactory.CreateTypeByCLRName(t.TypeName, myModule, true))))
         .ToArray());
     }
   }

ReSharper.FSharp/src/FSharp.Psi/src/Util/FcsSymbolMappingUtil.cs

@@ -220,7 +220,7 @@ private static IDeclaredElement GetDeclaredElement(FSharpUnionCase unionCase, IP
         return caseMember;
 
       var unionClrName = unionTypeElement.GetClrName();
-      var caseDeclaredType = TypeFactory.CreateTypeByCLRName(unionClrName + "+" + caseCompiledName, psiModule);
+      var caseDeclaredType = TypeFactory.CreateTypeByCLRName(unionClrName + "+" + caseCompiledName, psiModule, true);
       return caseDeclaredType.GetTypeElement();
     }
 

ReSharper.FSharp/src/FSharp.Psi/src/Util/FcsTypeMappingUtil.cs

@@ -212,7 +212,7 @@ public static IType MapType([NotNull] this ProvidedType providedType, IPsiModule
         return TypeFactory.CreatePointerType(providedType.GetElementType().MapType(module));
 
       if (!providedType.IsGenericType)
-        return TypeFactory.CreateTypeByCLRName(proxyProvidedType.GetClrName(), NullableAnnotation.Unknown, module);
+        return TypeFactory.CreateTypeByCLRName(proxyProvidedType.GetClrName(), module, true);
 
       if (providedType.GetGenericTypeDefinition() is not IProxyProvidedType genericTypeDefinition)
       {
@@ -221,7 +221,7 @@ public static IType MapType([NotNull] this ProvidedType providedType, IPsiModule
       }
 
       var typeDefinition =
-        TypeFactory.CreateTypeByCLRName(genericTypeDefinition.GetClrName(), NullableAnnotation.Unknown, module);
+        TypeFactory.CreateTypeByCLRName(genericTypeDefinition.GetClrName(), module, true);
 
       var genericProvidedArgs = providedType.GetGenericArguments();
       var genericTypes = new IType[genericProvidedArgs.Length];
@@ -359,6 +359,6 @@ public static IType GetExpressionTypeFromFcs([NotNull] this IFSharpTreeNode fsTr
     [NotNull]
     public static IDeclaredType CreateTypeByClrName([NotNull] this IClrTypeName clrTypeName,
       [NotNull] IPsiModule psiModule) =>
-      TypeFactory.CreateTypeByCLRName(clrTypeName, NullableAnnotation.Unknown, psiModule);
+      TypeFactory.CreateTypeByCLRName(clrTypeName, psiModule, true);
   }
 }