opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert r3546 (procedure parameters in completion proposal). Instead, add proposal with DefaultType=ctParams, which is able to display parameters as hint. Fixes issue #2149.

Browse Source
This commit is contained in:
Ansgar Becker
2010-10-06 23:07:06 +00:00
parent 38f3a580ea
commit be7ca6f1ac
2 changed files with 88 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/main.dfm
View File

@ -8749,4 +8749,30 @@ object MainForm: TMainForm
Left = 136
Top = 160
end
object ParameterCompletionProposal: TSynCompletionProposal
DefaultType = ctParams
Options = [scoLimitToMatchedText, scoUseBuiltInTimer, scoEndCharCompletion, scoCompleteWithTab, scoCompleteWithEnter]
ClBackground = clInfoBk
Width = 0
EndOfTokenChr = '()[]. '
TriggerChars = '('
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = []
TitleFont.Charset = DEFAULT_CHARSET
TitleFont.Color = clBtnText
TitleFont.Height = -11
TitleFont.Name = 'Default'
TitleFont.Style = [fsBold]
Columns = <>
Images = ImageListMain
OnExecute = ParameterCompletionProposalExecute
ShortCut = 24608
Editor = SynMemoQuery
TimerInterval = 500
Left = 136
Top = 197
end
end

94
source/main.pas
View File

@ -303,6 +303,7 @@ type
menuExporttables: TMenuItem;
popupListHeader: TVTHeaderPopupMenu;
SynCompletionProposal: TSynCompletionProposal;
ParameterCompletionProposal: TSynCompletionProposal;
SaveDialogSQLFile: TSaveDialog;
SynEditSearch1: TSynEditSearch;
SynEditRegexSearch1: TSynEditRegexSearch;
@ -572,6 +573,8 @@ type
procedure SynCompletionProposalExecute(Kind: SynCompletionType;
Sender: TObject; var CurrentInput: String; var x, y: Integer;
var CanExecute: Boolean);
procedure ParameterCompletionProposalExecute(Kind: SynCompletionType; Sender: TObject;
var CurrentInput: string; var x, y: Integer; var CanExecute: Boolean);
procedure PageControlMainChange(Sender: TObject);
procedure PageControlMainChanging(Sender: TObject; var AllowChange: Boolean);
procedure PageControlHostChange(Sender: TObject);
@ -1363,6 +1366,7 @@ begin
SetVistaFonts(Font);
InheritFont(Font);
InheritFont(SynCompletionProposal.Font);
InheritFont(ParameterCompletionProposal.Font);
// Simulated link label, has non inherited blue font color
InheritFont(lblExplainProcess.Font);
@ -1389,6 +1393,7 @@ begin
// Enable auto completion in data tab, filter editor
SynCompletionProposal.AddEditor(SynMemoFilter);
ParameterCompletionProposal.AddEditor(SynMemoFilter);
// Fix node height on Virtual Trees for current DPI settings
FixVT(DBTree);
@ -4427,39 +4432,10 @@ var
procedure addTable(Obj: TDBObject);
var
Params: TRoutineParamList;
Datatype: TDatatype;
Par: TRoutineParam;
DummyBool: Boolean;
ItemText, InsertText, Value, DummyString: String;
DisplayText: String;
begin
ItemText := Obj.Name;
InsertText := Obj.Name;
if Obj.NodeType in [lntFunction, lntProcedure] then begin
Params := TRoutineParamList.Create(True);
ParseRoutineStructure(Obj.CreateCode, Params, DummyBool, DummyString, DummyString, DummyString, DummyString, DummyString);
if Params.Count > 0 then begin
ItemText := ItemText + '(';
InsertText := InsertText + '(';
for Par in Params do begin
Datatype := GetDatatypeByName(GetFirstWord(Par.Datatype));
ItemText := ItemText + '\color{' + ColorToString(DatatypeCategories[Integer(Datatype.Category)].Color) + '}' + Par.Name + ': ' + Par.Datatype + '\color{clWindowText}, ';
case Datatype.Category of
dtcInteger: Value := '0';
dtcReal: Value := '0.0';
dtcTemporal: Value := 'NOW()';
else Value := esc(Par.Name);
end;
InsertText := InsertText + Value + ', ';
end;
Delete(ItemText, Length(ItemText)-1, 2);
Delete(InsertText, Length(InsertText)-1, 2);
ItemText := ItemText + ')';
InsertText := InsertText + ')';
end;
end;
Proposal.InsertList.Add(InsertText);
Proposal.ItemList.Add(Format(SYNCOMPLETION_PATTERN, [Obj.ImageIndex, LowerCase(Obj.ObjType), ItemText]));
DisplayText := Format(SYNCOMPLETION_PATTERN, [Obj.ImageIndex, LowerCase(Obj.ObjType), Obj.Name]);
Proposal.AddItem(DisplayText, Obj.Name);
end;
procedure addColumns( tablename: String );
@ -4646,6 +4622,59 @@ begin
end;
procedure TMainForm.ParameterCompletionProposalExecute(Kind: SynCompletionType; Sender: TObject; var CurrentInput: string;
var x, y: Integer; var CanExecute: Boolean);
var
LeftText, Identifier: String;
rx: TRegExpr;
i: Integer;
DummyBool: Boolean;
DbObjects: TDBObjectList;
DbObj: TDbObject;
Params: TRoutineParamList;
ItemText, DummyStr: String;
Prop: TSynCompletionProposal;
begin
// Display hint on function and procedure parameters
// Activated in preferences?
if not prefCompletionProposal then begin
CanExecute := False;
Exit;
end;
Prop := TSynCompletionProposal(Sender);
Prop.ItemList.Clear;
LeftText := Copy(Prop.Form.CurrentEditor.LineText, 0, Prop.Form.CurrentEditor.CaretX-1);
rx := TRegExpr.Create;
rx.Expression := '\b([\w\d]+)[`]?\(([^\(]*)$';
if rx.Exec(LeftText) then begin
Identifier := rx.Match[1];
// Tell proposal which parameter should be highlighted/bold
Prop.Form.CurrentIndex := 0;
for i:=1 to rx.MatchLen[2] do begin
if rx.Match[2][i] = ',' then
Prop.Form.CurrentIndex := Prop.Form.CurrentIndex + 1;
end;
// Find right function or proc object and concatenate its parameter list
DbObjects := ActiveConnection.GetDBObjects(ActiveConnection.Database, False);
for DbObj in DbObjects do begin
if (CompareText(DbObj.Name, Identifier)=0) and (DbObj.NodeType in [lntFunction, lntProcedure]) then begin
Params := TRoutineParamList.Create(True);
ParseRoutineStructure(DbObj.CreateCode, Params, DummyBool, DummyStr, DummyStr, DummyStr, DummyStr, DummyStr);
ItemText := '';
for i:=0 to Params.Count-1 do
ItemText := ItemText + '"' + Params[i].Name + ': ' + Params[i].Datatype + '", ';
Delete(ItemText, Length(ItemText)-2, 2);
Prop.ItemList.Add(ItemText);
end;
end;
end;
CanExecute := Prop.ItemList.Count > 0;
rx.Free;
end;
procedure TMainForm.SynMemoQueryStatusChange(Sender: TObject; Changes:
TSynStatusChanges);
begin
@ -8393,6 +8422,7 @@ begin
QueryTab.Memo.OnStatusChange := SynMemoQuery.OnStatusChange;
QueryTab.Memo.OnPaintTransient := SynMemoQuery.OnPaintTransient;
SynCompletionProposal.AddEditor(QueryTab.Memo);
ParameterCompletionProposal.AddEditor(QueryTab.Memo);
QueryTab.spltHelpers := TSplitter.Create(QueryTab.pnlMemo);
QueryTab.spltHelpers.Parent := QueryTab.pnlMemo;