GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Now correctly fetching signature and description for properties

Browse Source 
- Minor code cleanup
This commit is contained in:
Nils Hausfeld
2024-06-10 23:14:24 +02:00
parent ebff015c1c
commit 99c10e5ed3
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Editor/Surface/ContextMenu/VisjectCM.cs
View File

@@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Linq;
using FlaxEditor.GUI.ContextMenu;
using FlaxEditor.GUI.Input;
using FlaxEditor.Scripting;
using FlaxEngine;
using FlaxEngine.GUI;
using FlaxEngine.Utilities;
@@ -638,15 +639,27 @@ namespace FlaxEditor.Surface.ContextMenu
}
Profiler.BeginEvent("VisjectCM.SetDescriptionPanelArchetype");
_descriptionSignatureLabel.Text = archetype.Signature;
if (archetype.Tag is ScriptMemberInfo memberInfo)
{
var name = memberInfo.Name;
if (memberInfo.IsMethod && memberInfo.Name.StartsWith("get_") || memberInfo.Name.StartsWith("set_"))
{
name = memberInfo.Name.Substring(4);
}
_descriptionSignatureLabel.Text = memberInfo.DeclaringType + "." + name;
}
else
_descriptionSignatureLabel.Text = archetype.Signature;
float panelHeight = _descriptionSignatureLabel.Height;
_descriptionLabel.Y = _descriptionSignatureLabel.Bounds.Bottom + 6f;
_descriptionLabel.Text = archetype.Description;
panelHeight += _descriptionLabel.Height + 6f + 18f;
_descriptionPanel.Height = panelHeight;
Height = 400 + Mathf.RoundToInt(_descriptionPanel.Height);
UpdateWindowSize();

21
Source/Editor/Surface/SurfaceUtils.cs
View File

@@ -440,7 +440,7 @@ namespace FlaxEditor.Surface
return sb.ToString();
}
internal static string GetVisualScriptMemberInfoSignature(ScriptMemberInfo member, bool appendPropertyInfo = true)
internal static string GetVisualScriptMemberInfoSignature(ScriptMemberInfo member)
{
var name = member.Name;
var declaringType = member.DeclaringType;
@@ -454,7 +454,7 @@ namespace FlaxEditor.Surface
var property = declaringType.GetMembers(name.Substring(4), MemberTypes.Property, flags);
if (property != null && property.Length != 0)
{
return GetVisualScriptMemberInfoDescription(property[0]);
return GetVisualScriptMemberInfoSignature(property[0]);
}
}
@@ -483,7 +483,7 @@ namespace FlaxEditor.Surface
}
sb.Append(')');
}
else if (member.IsProperty && appendPropertyInfo)
else if (member.IsProperty)
{
sb.Append(' ');
sb.Append('{');
@@ -500,6 +500,21 @@ namespace FlaxEditor.Surface
internal static string GetVisualScriptMemberShortDescription(ScriptMemberInfo member)
{
var name = member.Name;
var declaringType = member.DeclaringType;
// Getter/setter method of the property - we can return early here
bool isGetterOrSetter = name.StartsWith("get_") || name.StartsWith("set_");
if (member.IsMethod && isGetterOrSetter)
{
var flags = member.IsStatic ? BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly : BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly;
var property = declaringType.GetMembers(name.Substring(4), MemberTypes.Property, flags);
if (property != null && property.Length != 0)
{
return GetVisualScriptMemberShortDescription(property[0]);
}
}
return Editor.Instance.CodeDocs.GetTooltip(member);
}