Skip to content

Commit 6e309c3

Browse files
committed
Tweaks
1 parent 543c701 commit 6e309c3

File tree

2 files changed

+27
-21
lines changed

2 files changed

+27
-21
lines changed

Source/ide/codetools/simba.ide_codetools_arrayhelpers.pas

+20-19
Original file line numberDiff line numberDiff line change
@@ -72,47 +72,48 @@ interface
7272
'procedure <ArrayName>.Append(Value: <ArrayVarType>); external;' + LineEnding +
7373
'procedure <ArrayName>.Extend(Value: <ArrayName>); external;';
7474

75+
// var x: array of SomeType;
7576
HELPERS_DYNARRAY_UNTYPED =
7677
'function <ArrayName>.Low: Integer; external;' + LineEnding +
7778
'function <ArrayName>.High: Integer; external;' + LineEnding +
78-
'function <ArrayName>.Contains(Value: array of <ArrayVarType>): Boolean; external;' + LineEnding +
79+
'function <ArrayName>.Contains(Value: <ArrayVarType>): Boolean; external;' + LineEnding +
7980
'procedure <ArrayName>.Swap(FromIndex, ToIndex: Integer); external;' + LineEnding +
8081
'function <ArrayName>.Unique: array of <ArrayVarType>; external;' + LineEnding +
81-
'function <ArrayName>.IndexOf(Value: array of <ArrayVarType>): Integer; external;' + LineEnding +
82-
'function <ArrayName>.IndicesOf(Value: array of <ArrayVarType>): TIntegerArray; external;' + LineEnding +
82+
'function <ArrayName>.IndexOf(Value: <ArrayVarType>): Integer; external;' + LineEnding +
83+
'function <ArrayName>.IndicesOf(Value: <ArrayVarType>): TIntegerArray; external;' + LineEnding +
8384
'procedure <ArrayName>.Sort; external;' + LineEnding +
84-
'procedure <ArrayName>.Sort(CompareFunc: function(constref L, R: array of <ArrayVarType>): Integer); external;' + LineEnding +
85+
'procedure <ArrayName>.Sort(CompareFunc: function(constref L, R: <ArrayVarType>): Integer); external;' + LineEnding +
8586
'procedure <ArrayName>.Sort(Weights: TIntegerArray; LowToHigh: Boolean); external;' + LineEnding +
8687
'function <ArrayName>.Sorted: array of <ArrayVarType>; external;' + LineEnding +
87-
'function <ArrayName>.Sorted(CompareFunc: function(constref L, R: array of <ArrayVarType>): Integer): array of <ArrayVarType>; external;' + LineEnding +
88+
'function <ArrayName>.Sorted(CompareFunc: function(constref L, R: <ArrayVarType>): Integer): array of <ArrayVarType>; external;' + LineEnding +
8889
'function <ArrayName>.Sorted(Weights: TIntegerArray; LowToHigh: Boolean): array of <ArrayVarType>; external;' + LineEnding +
8990
'function <ArrayName>.Length: Integer; external;' + LineEnding +
9091
'function <ArrayName>.Copy: array of <ArrayVarType>; external;' + LineEnding +
9192
'function <ArrayName>.Copy(StartIndex: Integer; Count: Integer = High(Integer)): array of <ArrayVarType>; external;' + LineEnding +
92-
'function <ArrayName>.First: array of <ArrayVarType>; external;' + LineEnding +
93-
'function <ArrayName>.Last: array of <ArrayVarType>; external;' + LineEnding +
94-
'function <ArrayName>.RandomValue: array of <ArrayVarType>; external;' + LineEnding +
93+
'function <ArrayName>.First: <ArrayVarType>; external;' + LineEnding +
94+
'function <ArrayName>.Last: <ArrayVarType>; external;' + LineEnding +
95+
'function <ArrayName>.RandomValue: <ArrayVarType>; external;' + LineEnding +
9596
'function <ArrayName>.Reversed: array of <ArrayVarType>; external;' + LineEnding +
96-
'function <ArrayName>.Min: array of <ArrayVarType>; external;' + LineEnding +
97-
'function <ArrayName>.Max: array of <ArrayVarType>; external;' + LineEnding +
98-
'function <ArrayName>.Sum: array of <ArrayVarType>; external;' + LineEnding +
99-
'function <ArrayName>.Mode: array of <ArrayVarType>; external;' + LineEnding +
97+
'function <ArrayName>.Min: <ArrayVarType>; external;' + LineEnding +
98+
'function <ArrayName>.Max: <ArrayVarType>; external;' + LineEnding +
99+
'function <ArrayName>.Sum: <ArrayVarType>; external;' + LineEnding +
100+
'function <ArrayName>.Mode: <ArrayVarType>; external;' + LineEnding +
100101
'function <ArrayName>.Median: Double; external;' + LineEnding +
101102
'function <ArrayName>.Mean: Double; external;' + LineEnding +
102103
'function <ArrayName>.Variance: Double; external;' + LineEnding +
103104
'function <ArrayName>.Stdev: Double; external;' + LineEnding +
104105
'function <ArrayName>.Slice(Start, Stop, Step: Integer): array of <ArrayVarType>; external;' + LineEnding +
105-
'function <ArrayName>.Remove(Value: array of <ArrayVarType>): Boolean; external;' + LineEnding +
106-
'function <ArrayName>.RemoveAll(Value: array of <ArrayVarType>): Integer; external;' + LineEnding +
106+
'function <ArrayName>.Remove(Value: <ArrayVarType>): Boolean; external;' + LineEnding +
107+
'function <ArrayName>.RemoveAll(Value: <ArrayVarType>): Integer; external;' + LineEnding +
107108
'procedure <ArrayName>.Delete(Index: Integer; Count: Integer = High(Integer)); external;' + LineEnding +
108-
'procedure <ArrayName>.Insert(Item: array of <ArrayVarType>; Index: Integer); external;' + LineEnding +
109+
'procedure <ArrayName>.Insert(Item: <ArrayVarType>; Index: Integer); external;' + LineEnding +
109110
'procedure <ArrayName>.SetLength(NewLength: Integer); external;' + LineEnding +
110-
'function <ArrayName>.Pop: array of <ArrayVarType>; external;' + LineEnding +
111-
'function <ArrayName>.Pop(Index: Integer): array of <ArrayVarType>; external;' + LineEnding +
112-
'function <ArrayName>.RandomValue: array of <ArrayVarType>; external;' + LineEnding +
111+
'function <ArrayName>.Pop: <ArrayVarType>; external;' + LineEnding +
112+
'function <ArrayName>.Pop(Index: Integer): <ArrayVarType>; external;' + LineEnding +
113+
'function <ArrayName>.RandomValue: <ArrayVarType>; external;' + LineEnding +
113114
'procedure <ArrayName>.Reverse; external;' + LineEnding +
114115
'procedure <ArrayName>.Clear; external;' + LineEnding +
115-
'procedure <ArrayName>.Append(Value: array of <ArrayVarType>); external;' + LineEnding +
116+
'procedure <ArrayName>.Append(Value: <ArrayVarType>); external;' + LineEnding +
116117
'procedure <ArrayName>.Extend(Value: array of <ArrayVarType>); external;';
117118

118119
HELPERS_STATICARRAY =

Source/ide/simba.ide_editor_docgenerator.pas

+7-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ interface
1818
'(*' + LineEnding +
1919
'%s' + LineEnding +
2020
'%s' + LineEnding +
21-
'> %s' + LineEnding +
21+
'```' + LineEnding +
22+
'%s' + LineEnding +
23+
'```' + LineEnding +
2224
'*)' + LineEnding;
2325

2426
type
@@ -36,7 +38,8 @@ TSimbaEditorPlugin_DocGenerator = class(TLazSynEditPlugin)
3638
implementation
3739

3840
uses
39-
simba.ide_codetools_base, simba.ide_codetools_parser, simba.settings;
41+
simba.ide_codetools_base, simba.ide_codetools_parser, simba.settings,
42+
simba.dialog;
4043

4144
procedure TSimbaEditorPlugin_DocGenerator.DoEditorAdded(Value: TCustomSynEdit);
4245
begin
@@ -97,6 +100,8 @@ procedure TSimbaEditorPlugin_DocGenerator.InsertDocumentation;
97100
InsertDocAtMethod(Decl.ParentByClass[TDeclaration_Method]);
98101
end;
99102
except
103+
on E: Exception do
104+
SimbaErrorDlg('Simba', 'Insert documentation error: %s', [E.Message]);
100105
end;
101106
if (Parser <> nil) then
102107
Parser.Free();

0 commit comments

Comments
 (0)