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

fix in semantic intellisense

Browse source
This commit is contained in:
Ivan Bondarev 2021-11-18 20:40:35 +01:00
parent a483adde7d
commit daf20fdb99
4 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CodeCompletion/DomSyntaxTreeVisitor.cs
View file

@ -3480,6 +3480,20 @@ namespace CodeCompletion
}
}
}
/*if (good_procs.Count == 0)
{
for (int i = 0; i < meths.Length; i++)
{
if (meths[i] is ProcScope)
{
if ((meths[i] as ProcScope).parameters.Count == arg_types.Count)
{
good_procs.Add(meths[i] as ProcScope);
break;
}
}
}
}*/
if (good_procs.Count > 0)
{
if (obj != null)

5
CodeCompletion/SymTable.cs
View file

@ -3668,7 +3668,7 @@ namespace CodeCompletion
if (arrs == null || !arrs.is_dynamic_arr && !arrs.IsMultiDynArray)
if (ts is TypeSynonim) return this.IsConvertable((ts as TypeSynonim).actType);
else return false;
if (arrs.elementType == null)
if (arrs.elementType == null || arrs.elementType is TemplateParameterScope)
return true;
if (!this.elementType.IsEqual(arrs.elementType)) return false;
if (this.IsMultiDynArray && arrs.IsMultiDynArray)
@ -3693,7 +3693,8 @@ namespace CodeCompletion
return this.IsEqual((ts as TypeSynonim).actType);
else
return false;
if (arrs.elementType == null) return true;
if (arrs.elementType == null || arrs.elementType is TemplateParameterScope)
return true;
if (!this.elementType.IsEqual(arrs.elementType))
return false;
if (is_multi_dyn_arr && !arrs.is_multi_dyn_arr)

9
TestSuite/intellisense_tests/lambdas12.pas Normal file
View file

@ -0,0 +1,9 @@
begin
var a := MatrRandomInteger(3,4,1,9);
a.Println;
Println;
var b := a.Cols;
Sort(b, col -> col{@parameter col: array of integer;@}.Sum); // Сортировка с проекцией на ключ
a := MatrByCol(b); // собрать матрицу из массива массивов
a.Println;
end.

4
VisualPascalABCNET/Workbench/OptionsManager.cs
View file

@ -239,7 +239,11 @@ namespace VisualPascalABC
if ((value = (string)Options[OptionsItemPABCDllChecked]) != null)
UserOptions.PABCDllChecked = Convert.ToBoolean(value);
if ((value = (string)Options[OptionsItemNameUseSemanticIntellisense]) != null)
{
UserOptions.UseSemanticIntellisense = Convert.ToBoolean(value);
CodeCompletion.DomSyntaxTreeVisitor.use_semantic_for_intellisense = UserOptions.UseSemanticIntellisense;
}
int i = 0;
while ((value = (string)Options[OptionsItemNameLastFile + (i++).ToString()]) != null)
AddLastFile(value);