administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix extensions search for transitive interfaces (#3397)

Browse source
This commit is contained in:
Александр Земляк 2026-03-08 18:56:01 +03:00 committed by GitHub
parent 030c385754
commit 7b9657ed6b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 72 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
CodeCompletion/SymTable.cs
View file

@ -441,13 +441,12 @@ namespace CodeCompletion
else
tmp_ts = tmp_ts.baseScope;
}
if (ts.implemented_interfaces != null && !(ts is ArrayScope && (!(ts as ArrayScope).is_dynamic_arr || (ts as ArrayScope).Rank > 1)))
var implementedInterfaces = ts.GetAllImplementedInterfaces();
if (implementedInterfaces != null)
{
List<TypeScope> implemented_interfaces = new List<TypeScope>();
implemented_interfaces.AddRange(ts.implemented_interfaces);
if (ts is ArrayScope)
implemented_interfaces.Add((ts as ArrayScope).ilist);
foreach (TypeScope int_ts in implemented_interfaces)
foreach (TypeScope int_ts in implementedInterfaces)
{
TypeScope int_ts2 = int_ts;
if (int_ts is CompiledScope && (int_ts as CompiledScope).CompiledType.IsGenericType && !(int_ts as CompiledScope).CompiledType.IsGenericTypeDefinition)
@ -467,7 +466,7 @@ namespace CodeCompletion
if (t.GenericTypeDefinition == int_ts2.GenericTypeDefinition || t.IsEqual(int_ts2) ||
(t is ArrayScope && int_ts2.IsArray && t.Rank == int_ts2.Rank) ||
(int_ts2 is ArrayScope && t.IsArray && int_ts2.Rank == t.Rank) ||
t is FileScope && int_ts2 is FileScope &&
t is FileScope && int_ts2 is FileScope &&
((t as FileScope).elementType == null) == ((int_ts2 as FileScope).elementType == null))
{
var meth_list = extension_methods[t];
@ -479,11 +478,9 @@ namespace CodeCompletion
//break;
}
}
}
}
}
}
if (this.used_units != null)
for (int i = 0; i < this.used_units.Count; i++)
@ -3338,6 +3335,11 @@ namespace CodeCompletion
return actType.GetNamesAsInObject();
}
public override List<TypeScope> GetAllImplementedInterfaces()
{
return actType.GetAllImplementedInterfaces();
}
public override TypeScope[] GetIndexers()
{
return actType.GetIndexers();
@ -3530,6 +3532,11 @@ namespace CodeCompletion
return actType.GetNamesAsInObject();
}
public override List<TypeScope> GetAllImplementedInterfaces()
{
return actType.GetAllImplementedInterfaces();
}
public override TypeScope[] GetIndexers()
{
return actType.GetIndexers();
@ -3775,6 +3782,14 @@ namespace CodeCompletion
return new SymInfo[0];
}
public override List<TypeScope> GetAllImplementedInterfaces()
{
if (!is_dynamic_arr && !IsMultiDynArray)
return new List<TypeScope>();
return base.GetAllImplementedInterfaces();
}
public override List<SymScope> FindOverloadNamesOnlyInType(string name)
{
if (!is_dynamic_arr && !IsMultiDynArray)
@ -4569,6 +4584,45 @@ namespace CodeCompletion
return procs;
}
/// <summary>
/// Возвращает все реализуемые интерфейсы (включая интерфейсы, реализуемые классами предками и базовые интерфейсы для реализуемых интерфейсов).
/// Если реализуемых интерфейсов нет, то возвращается пустой список
/// </summary>
public virtual List<TypeScope> GetAllImplementedInterfaces()
{
var implementedInterfaces = new List<TypeScope>();
if (implemented_interfaces != null)
implementedInterfaces.AddRange(implemented_interfaces);
if (baseScope != null)
{
var recursiveInterfaces = baseScope.GetAllImplementedInterfaces();
foreach (var _interface in recursiveInterfaces)
{
if (!implementedInterfaces.Contains(_interface))
implementedInterfaces.Add(_interface);
}
}
if (implemented_interfaces != null)
{
foreach (var _interface in implemented_interfaces)
{
var recursiveInterfaces = _interface.GetAllImplementedInterfaces();
foreach (var interface2 in recursiveInterfaces)
{
if (!implementedInterfaces.Contains(interface2))
implementedInterfaces.Add(interface2);
}
}
}
return implementedInterfaces;
}
public virtual List<ProcScope> GetMethods()
{
List<ProcScope> procs = new List<ProcScope>();
@ -6209,6 +6263,15 @@ namespace CodeCompletion
return syms;
}
public override List<TypeScope> GetAllImplementedInterfaces()
{
// Здесь все сразу записаны в поле, поскольку так работает GetInterfaces() из .NET
if (implemented_interfaces != null)
return implemented_interfaces.ToList();
return new List<TypeScope>();
}
private void AddIndexers()
{
List<TypeScope> indexers = new List<TypeScope>();