Skip to content

Sync with the ultimate master #1044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jetbrains-net-syncer wants to merge 1 commit into from
Closed

Sync with the ultimate master #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ReSharper.FSharp/src/FSharp/FSharp.Psi/src/IFSharpDeclaredElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public interface IFSharpDeclaredElement : IClrDeclaredElement
string SourceName { get; }
}

public interface IFSharpTypeElement : IFSharpDeclaredElement, ITypeElement, IAccessRightsOwner
public interface IFSharpTypeElement : IFSharpDeclaredElement, ITypeElement, ITypeMember
{
ModuleMembersAccessKind AccessKind { get; }
}
Expand Down
3 changes: 2 additions & 1 deletion ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Impl/FSharpAccessRights.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using JetBrains.ReSharper.Psi;
using JetBrains.ReSharper.Psi.Modules;
using JetBrains.ReSharper.Psi.Tree;
using JetBrains.ReSharper.Psi.Util;

namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Impl;

Expand Down Expand Up @@ -160,7 +161,7 @@ public static bool IsAccessible(ITypeElement typeElement, ITreeNode context)
if (accessRights == AccessRights.PRIVATE && !IsTheSameOwner(fsTypeElement, context))
return false;

if (accessRights == AccessRights.INTERNAL && !typeElement.IsInternalsVisibleToApplies(context.GetPsiModule()))
if (accessRights == AccessRights.INTERNAL && !AccessUtil.IsInternalSymbolAccessible(fsTypeElement, context.GetPsiModule()))
return false;

if (fsTypeElement is IFSharpSourceTypeElement fsSourceTypeElement)
Expand Down
Loading