mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-29 14:50:32 +02:00
MG: fixed completion box for templates and identifiers
git-svn-id: trunk@1453 -
This commit is contained in:
lazarus
parent
2295af44f4
commit
63e0c71c47
@ -239,6 +239,10 @@ begin
|
|||||||
if not fParsed then
|
if not fParsed then
|
||||||
ParseCompletionList;
|
ParseCompletionList;
|
||||||
Len := Length(AToken);
|
Len := Length(AToken);
|
||||||
|
{$IFDEF SYN_LAZARUS}
|
||||||
|
if (Len=0) and Assigned(fOnTokenNotFound) then
|
||||||
|
fOnTokenNotFound(Self,AToken,AEditor,i);
|
||||||
|
{$ENDIF}
|
||||||
if (Len > 0) and (AEditor <> nil) and not AEditor.ReadOnly
|
if (Len > 0) and (AEditor <> nil) and not AEditor.ReadOnly
|
||||||
and (fCompletions.Count > 0)
|
and (fCompletions.Count > 0)
|
||||||
then begin
|
then begin
|
||||||
|
|||||||
@ -6085,7 +6085,7 @@ begin
|
|||||||
if FCodeLastActivated then begin
|
if FCodeLastActivated then begin
|
||||||
// send command to source editor
|
// send command to source editor
|
||||||
if ActiveSourceEditor=nil then exit;
|
if ActiveSourceEditor=nil then exit;
|
||||||
ActiveSourceEditor.DoEditorBasicAction(EditorCommand);
|
ActiveSourceEditor.DoEditorExecuteCommand(EditorCommand);
|
||||||
end else begin
|
end else begin
|
||||||
// send command to form editor
|
// send command to form editor
|
||||||
if ActiveUnitInfo=nil then exit;
|
if ActiveUnitInfo=nil then exit;
|
||||||
@ -6107,6 +6107,9 @@ end.
|
|||||||
|
|
||||||
{ =============================================================================
|
{ =============================================================================
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.229 2002/02/22 14:25:00 lazarus
|
||||||
|
MG: fixed completion box for templates and identifiers
|
||||||
|
|
||||||
Revision 1.228 2002/02/22 14:05:55 lazarus
|
Revision 1.228 2002/02/22 14:05:55 lazarus
|
||||||
MG: edit menu reconnected to source editor
|
MG: edit menu reconnected to source editor
|
||||||
|
|
||||||
|
|||||||
@ -194,7 +194,7 @@ type
|
|||||||
procedure GetDialogPosition(Width, Height:integer; var Left,Top:integer);
|
procedure GetDialogPosition(Width, Height:integer; var Left,Top:integer);
|
||||||
|
|
||||||
// editor commands
|
// editor commands
|
||||||
procedure DoEditorBasicAction(EditorCommand: integer);
|
procedure DoEditorExecuteCommand(EditorCommand: integer);
|
||||||
|
|
||||||
//used to get the word at the mouse cursor
|
//used to get the word at the mouse cursor
|
||||||
Function GetWordAtPosition(Position : TPoint) : String;
|
Function GetWordAtPosition(Position : TPoint) : String;
|
||||||
@ -1494,7 +1494,7 @@ begin
|
|||||||
FVisible:=Value;
|
FVisible:=Value;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSourceEditor.DoEditorBasicAction(EditorCommand: integer);
|
procedure TSourceEditor.DoEditorExecuteCommand(EditorCommand: integer);
|
||||||
begin
|
begin
|
||||||
EditorComponent.ExecuteCommand(EditorCommand,' ',nil);
|
EditorComponent.ExecuteCommand(EditorCommand,' ',nil);
|
||||||
end;
|
end;
|
||||||
@ -1752,6 +1752,7 @@ procedure TSourceNotebook.OnCodeTemplateTokenNotFound(Sender: TObject;
|
|||||||
AToken: string; AnEditor: TCustomSynEdit; var Index:integer);
|
AToken: string; AnEditor: TCustomSynEdit; var Index:integer);
|
||||||
var P:TPoint;
|
var P:TPoint;
|
||||||
begin
|
begin
|
||||||
|
writeln('RRRRRRRRRRR ',AToken,',',AnEditor.ReadOnly,',',CurrentCompletionType=ctNone);
|
||||||
if (AnEditor.ReadOnly=false) and (CurrentCompletionType=ctNone) then begin
|
if (AnEditor.ReadOnly=false) and (CurrentCompletionType=ctNone) then begin
|
||||||
CurrentCompletionType:=ctTemplateCompletion;
|
CurrentCompletionType:=ctTemplateCompletion;
|
||||||
with AnEditor do
|
with AnEditor do
|
||||||
@ -1901,98 +1902,101 @@ Begin
|
|||||||
while (X2>0) and (CurLine[X2] in ['A'..'Z','a'..'z','0'..'9','_']) do dec(X2);
|
while (X2>0) and (CurLine[X2] in ['A'..'Z','a'..'z','0'..'9','_']) do dec(X2);
|
||||||
CompName:=copy(CurLine,X2+1,X1-X2-1);
|
CompName:=copy(CurLine,X2+1,X1-X2-1);
|
||||||
CompInt := TComponentInterface(FormEditor1.FindComponentByName(CompName));
|
CompInt := TComponentInterface(FormEditor1.FindComponentByName(CompName));
|
||||||
if CompInt = nil then Exit;
|
if CompInt = nil then begin
|
||||||
//get all methods
|
ccSelection:='';
|
||||||
NewStr := '';
|
end else begin
|
||||||
for I := 0 to CompInt.GetPropCount-1 do
|
//get all methods
|
||||||
Begin
|
|
||||||
PropName:=#3'B'+CompInt.GetPropName(I)+#3'b';
|
|
||||||
PropKind := CompInt.GetPropType(i);
|
|
||||||
case PropKind of
|
|
||||||
tkMethod :
|
|
||||||
Begin
|
|
||||||
TypeInfo := CompInt.GetPropTypeInfo(I);
|
|
||||||
TypeData := GetTypeData(TypeInfo);
|
|
||||||
|
|
||||||
//check for parameters
|
|
||||||
if TypeData^.ParamCount > 0 then
|
|
||||||
Begin
|
|
||||||
{Writeln('----');
|
|
||||||
for Count := 0 to 60 do
|
|
||||||
if TypeData^.ParamList[Count] in ['a'..'z','A'..'Z','0'..'9'] then
|
|
||||||
Write(TypeData^.ParamList[Count])
|
|
||||||
else
|
|
||||||
Begin
|
|
||||||
Write('$',HexStr(ord(TypeData^.ParamList[Count]),3),' ');
|
|
||||||
end;
|
|
||||||
}
|
|
||||||
ParamStr := '';
|
|
||||||
Offset:=0;
|
|
||||||
for Count := 0 to TypeData^.ParamCount-1 do
|
|
||||||
begin
|
|
||||||
Len:=1; // strange: SizeOf(TParamFlags) is 4, but the data is only 1 byte
|
|
||||||
Move(TypeData^.ParamList[Offset],MethodRec.Flags,Len);
|
|
||||||
inc(Offset,Len);
|
|
||||||
|
|
||||||
Len:=ord(TypeData^.ParamList[Offset]);
|
|
||||||
inc(Offset);
|
|
||||||
SetLength(MethodRec.ParamName,Len);
|
|
||||||
Move(TypeData^.ParamList[Offset],MethodRec.ParamName[1],Len);
|
|
||||||
inc(Offset,Len);
|
|
||||||
|
|
||||||
Len:=ord(TypeData^.ParamList[Offset]);
|
|
||||||
inc(Offset);
|
|
||||||
SetLength(MethodRec.TypeName,Len);
|
|
||||||
Move(TypeData^.ParamList[Offset],MethodRec.TypeName[1],Len);
|
|
||||||
inc(Offset,Len);
|
|
||||||
|
|
||||||
if ParamStr<>'' then ParamStr:=';'+ParamStr;
|
|
||||||
if MethodRec.ParamName='' then
|
|
||||||
ParamStr:=MethodRec.TypeName+ParamStr
|
|
||||||
else
|
|
||||||
ParamStr:=MethodRec.ParamName+':'+MethodRec.TypeName+ParamStr;
|
|
||||||
if (pfVar in MethodRec.Flags) then ParamStr := 'var '+ParamStr;
|
|
||||||
if (pfConst in MethodRec.Flags) then ParamStr := 'const '+ParamStr;
|
|
||||||
if (pfOut in MethodRec.Flags) then ParamStr := 'out '+ParamStr;
|
|
||||||
end;
|
|
||||||
NewStr:='('+ParamStr+')';
|
|
||||||
end else NewStr:='';
|
|
||||||
case TypeData^.MethodKind of
|
|
||||||
mkProcedure :
|
|
||||||
NewStr := 'procedure '+PropName+' :'+CompInt.GetPropTypeName(I);
|
|
||||||
mkFunction :
|
|
||||||
NewStr := 'function '+PropName+' :'+CompInt.GetPropTypeName(I);
|
|
||||||
mkClassFunction :
|
|
||||||
NewStr := 'function '+PropName+' :'+'Function '+NewStr;
|
|
||||||
mkClassProcedure :
|
|
||||||
NewStr := 'procedure '+PropName+' :'+'Procedure '+NewStr;
|
|
||||||
mkConstructor :
|
|
||||||
NewStr := 'constructor '+PropName+' '+'procedure ';
|
|
||||||
mkDestructor :
|
|
||||||
NewStr := 'destructor '+PropName+' '+'procedure ';
|
|
||||||
end;
|
|
||||||
end;
|
|
||||||
|
|
||||||
|
|
||||||
tkObject :
|
|
||||||
NewStr := 'object '+PropName+' :'+CompInt.GetPropTypeName(I);
|
|
||||||
tkInteger,tkChar,tkEnumeration,tkWChar :
|
|
||||||
NewStr := 'var '+PropName+' :'+CompInt.GetPropTypeName(I);
|
|
||||||
tkBool :
|
|
||||||
NewStr := 'var '+PropName+' :'+CompInt.GetPropTypeName(I);
|
|
||||||
tkClass :
|
|
||||||
NewStr := 'class '+PropName+' :'+CompInt.GetPropTypeName(I);
|
|
||||||
tkFloat :
|
|
||||||
NewStr := 'var '+PropName+' :'+CompInt.GetPropTypeName(I);
|
|
||||||
tkSString :
|
|
||||||
NewStr := 'var '+PropName+' :'+CompInt.GetPropTypeName(I);
|
|
||||||
tkUnKnown,tkLString,tkWString,tkAString,tkVariant :
|
|
||||||
NewStr := 'var '+PropName+' :'+CompInt.GetPropTypeName(I);
|
|
||||||
end;
|
|
||||||
|
|
||||||
if NewStr <> '' then S.Add(NewStr);
|
|
||||||
NewStr := '';
|
NewStr := '';
|
||||||
end; // end for
|
for I := 0 to CompInt.GetPropCount-1 do
|
||||||
|
Begin
|
||||||
|
PropName:=#3'B'+CompInt.GetPropName(I)+#3'b';
|
||||||
|
PropKind := CompInt.GetPropType(i);
|
||||||
|
case PropKind of
|
||||||
|
tkMethod :
|
||||||
|
Begin
|
||||||
|
TypeInfo := CompInt.GetPropTypeInfo(I);
|
||||||
|
TypeData := GetTypeData(TypeInfo);
|
||||||
|
|
||||||
|
//check for parameters
|
||||||
|
if TypeData^.ParamCount > 0 then
|
||||||
|
Begin
|
||||||
|
{Writeln('----');
|
||||||
|
for Count := 0 to 60 do
|
||||||
|
if TypeData^.ParamList[Count] in ['a'..'z','A'..'Z','0'..'9'] then
|
||||||
|
Write(TypeData^.ParamList[Count])
|
||||||
|
else
|
||||||
|
Begin
|
||||||
|
Write('$',HexStr(ord(TypeData^.ParamList[Count]),3),' ');
|
||||||
|
end;
|
||||||
|
}
|
||||||
|
ParamStr := '';
|
||||||
|
Offset:=0;
|
||||||
|
for Count := 0 to TypeData^.ParamCount-1 do
|
||||||
|
begin
|
||||||
|
Len:=1; // strange: SizeOf(TParamFlags) is 4, but the data is only 1 byte
|
||||||
|
Move(TypeData^.ParamList[Offset],MethodRec.Flags,Len);
|
||||||
|
inc(Offset,Len);
|
||||||
|
|
||||||
|
Len:=ord(TypeData^.ParamList[Offset]);
|
||||||
|
inc(Offset);
|
||||||
|
SetLength(MethodRec.ParamName,Len);
|
||||||
|
Move(TypeData^.ParamList[Offset],MethodRec.ParamName[1],Len);
|
||||||
|
inc(Offset,Len);
|
||||||
|
|
||||||
|
Len:=ord(TypeData^.ParamList[Offset]);
|
||||||
|
inc(Offset);
|
||||||
|
SetLength(MethodRec.TypeName,Len);
|
||||||
|
Move(TypeData^.ParamList[Offset],MethodRec.TypeName[1],Len);
|
||||||
|
inc(Offset,Len);
|
||||||
|
|
||||||
|
if ParamStr<>'' then ParamStr:=';'+ParamStr;
|
||||||
|
if MethodRec.ParamName='' then
|
||||||
|
ParamStr:=MethodRec.TypeName+ParamStr
|
||||||
|
else
|
||||||
|
ParamStr:=MethodRec.ParamName+':'+MethodRec.TypeName+ParamStr;
|
||||||
|
if (pfVar in MethodRec.Flags) then ParamStr := 'var '+ParamStr;
|
||||||
|
if (pfConst in MethodRec.Flags) then ParamStr := 'const '+ParamStr;
|
||||||
|
if (pfOut in MethodRec.Flags) then ParamStr := 'out '+ParamStr;
|
||||||
|
end;
|
||||||
|
NewStr:='('+ParamStr+')';
|
||||||
|
end else NewStr:='';
|
||||||
|
case TypeData^.MethodKind of
|
||||||
|
mkProcedure :
|
||||||
|
NewStr := 'procedure '+PropName+' :'+CompInt.GetPropTypeName(I);
|
||||||
|
mkFunction :
|
||||||
|
NewStr := 'function '+PropName+' :'+CompInt.GetPropTypeName(I);
|
||||||
|
mkClassFunction :
|
||||||
|
NewStr := 'function '+PropName+' :'+'Function '+NewStr;
|
||||||
|
mkClassProcedure :
|
||||||
|
NewStr := 'procedure '+PropName+' :'+'Procedure '+NewStr;
|
||||||
|
mkConstructor :
|
||||||
|
NewStr := 'constructor '+PropName+' '+'procedure ';
|
||||||
|
mkDestructor :
|
||||||
|
NewStr := 'destructor '+PropName+' '+'procedure ';
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
tkObject :
|
||||||
|
NewStr := 'object '+PropName+' :'+CompInt.GetPropTypeName(I);
|
||||||
|
tkInteger,tkChar,tkEnumeration,tkWChar :
|
||||||
|
NewStr := 'var '+PropName+' :'+CompInt.GetPropTypeName(I);
|
||||||
|
tkBool :
|
||||||
|
NewStr := 'var '+PropName+' :'+CompInt.GetPropTypeName(I);
|
||||||
|
tkClass :
|
||||||
|
NewStr := 'class '+PropName+' :'+CompInt.GetPropTypeName(I);
|
||||||
|
tkFloat :
|
||||||
|
NewStr := 'var '+PropName+' :'+CompInt.GetPropTypeName(I);
|
||||||
|
tkSString :
|
||||||
|
NewStr := 'var '+PropName+' :'+CompInt.GetPropTypeName(I);
|
||||||
|
tkUnKnown,tkLString,tkWString,tkAString,tkVariant :
|
||||||
|
NewStr := 'var '+PropName+' :'+CompInt.GetPropTypeName(I);
|
||||||
|
end;
|
||||||
|
|
||||||
|
if NewStr <> '' then S.Add(NewStr);
|
||||||
|
NewStr := '';
|
||||||
|
end; // end for
|
||||||
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
ctWordCompletion:
|
ctWordCompletion:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user