forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from BBasile/Coedit/master 

Coedit/master
This commit is contained in:
Basile Burg 2014-12-03 03:28:33 +01:00
parent b710d45062 9470f53a58
commit e4b6c29bd2
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ce_d2syn.pas
View File

@ -234,6 +234,7 @@ begin
if src_t.rangeKinds <> rangeKinds then exit(1); if src_t.rangeKinds <> rangeKinds then exit(1);
if src_t.nestedCommentsCount <> nestedCommentsCount then exit(1); if src_t.nestedCommentsCount <> nestedCommentsCount then exit(1);
if src_t.tokenStringBracketsCount <> tokenStringBracketsCount then exit(1); if src_t.tokenStringBracketsCount <> tokenStringBracketsCount then exit(1);
if src_t.rString <> rString then exit(1);
exit(0); exit(0);
end; end;
end; end;
@ -244,6 +245,7 @@ begin
nestedCommentsCount := 0; nestedCommentsCount := 0;
tokenStringBracketsCount := 0; tokenStringBracketsCount := 0;
rangeKinds := []; rangeKinds := [];
rString := false;
end; end;
procedure TSynD2SynRange.copyFrom(aSource: TSynD2SynRange); procedure TSynD2SynRange.copyFrom(aSource: TSynD2SynRange);
@ -253,6 +255,7 @@ begin
rangeKinds := aSource.rangeKinds; rangeKinds := aSource.rangeKinds;
primaryRange := aSource.primaryRange; primaryRange := aSource.primaryRange;
secondaryRange := aSource.secondaryRange; secondaryRange := aSource.secondaryRange;
rString := aSource.rString;
end; end;
constructor TSynD2Syn.create(aOwner: TComponent); constructor TSynD2Syn.create(aOwner: TComponent);
@ -566,6 +569,7 @@ begin
fCurrRange.rString := reader^ = 'r'; fCurrRange.rString := reader^ = 'r';
if not (readerNext^ = '"') then if not (readerNext^ = '"') then
begin begin
fCurrRange.rString := false;
readerPrev; readerPrev;
goto _postString1; goto _postString1;
end; end;

33
src/ce_staticexplorer.pas
View File

@ -6,7 +6,7 @@ interface
uses uses
Classes, SysUtils, TreeFilterEdit, Forms, Controls, Graphics, ExtCtrls, Menus, Classes, SysUtils, TreeFilterEdit, Forms, Controls, Graphics, ExtCtrls, Menus,
ComCtrls, ce_widget, jsonparser, fpjson, process, actnlist, Buttons, ComCtrls, ce_widget, jsonparser, fpjson, process, actnlist, Buttons, Clipbrd,
ce_common, ce_project, ce_observer, ce_synmemo, ce_interfaces; ce_common, ce_project, ce_observer, ce_synmemo, ce_interfaces;
type type
@ -25,6 +25,7 @@ type
private private
fDmdProc: TCheckedAsyncProcess; fDmdProc: TCheckedAsyncProcess;
fLogMessager: TCELogMessageSubject; fLogMessager: TCELogMessageSubject;
fActCopyIdent: TAction;
fActRefresh: TAction; fActRefresh: TAction;
fActRefreshOnChange: TAction; fActRefreshOnChange: TAction;
fActRefreshOnFocus: TAction; fActRefreshOnFocus: TAction;
@ -43,6 +44,7 @@ type
procedure actAutoRefreshExecute(Sender: TObject); procedure actAutoRefreshExecute(Sender: TObject);
procedure actRefreshOnChangeExecute(Sender: TObject); procedure actRefreshOnChangeExecute(Sender: TObject);
procedure actRefreshOnFocusExecute(Sender: TObject); procedure actRefreshOnFocusExecute(Sender: TObject);
procedure actCopyIdentExecute(Sender: TObject);
procedure updateVisibleCat; procedure updateVisibleCat;
// //
procedure produceJsonInfo; procedure produceJsonInfo;
@ -93,6 +95,10 @@ begin
fAutoRefresh := false; fAutoRefresh := false;
fRefreshOnFocus := true; fRefreshOnFocus := true;
fRefreshOnChange := false; fRefreshOnChange := false;
fActCopyIdent := TAction.Create(self);
fActCopyIdent.OnExecute:=@actCopyIdentExecute;
fActCopyIdent.Caption := 'Copy identifer';
fActRefresh := TAction.Create(self); fActRefresh := TAction.Create(self);
fActRefresh.OnExecute := @actRefreshExecute; fActRefresh.OnExecute := @actRefreshExecute;
fActRefresh.Caption := 'Refresh'; fActRefresh.Caption := 'Refresh';
@ -196,17 +202,18 @@ end;
function TCEStaticExplorerWidget.contextActionCount: integer; function TCEStaticExplorerWidget.contextActionCount: integer;
begin begin
result := 5; result := 6;
end; end;
function TCEStaticExplorerWidget.contextAction(index: integer): TAction; function TCEStaticExplorerWidget.contextAction(index: integer): TAction;
begin begin
case index of case index of
0: exit(fActSelectInSource); 0: exit(fActSelectInSource);
1: exit(fActRefresh); 1: exit(fActCopyIdent);
2: exit(fActAutoRefresh); 2: exit(fActRefresh);
3: exit(fActRefreshOnChange); 3: exit(fActAutoRefresh);
4: exit(fActRefreshOnFocus); 4: exit(fActRefreshOnChange);
5: exit(fActRefreshOnFocus);
else result := nil; else result := nil;
end; end;
end; end;
@ -231,6 +238,13 @@ procedure TCEStaticExplorerWidget.actRefreshOnFocusExecute(Sender: TObject);
begin begin
refreshOnFocus := not refreshOnFocus; refreshOnFocus := not refreshOnFocus;
end; end;
procedure TCEStaticExplorerWidget.actCopyIdentExecute(Sender: TObject);
begin
if Tree.Selected = nil then exit;
Clipboard.AsText:= Tree.Selected.Text;
end;
{$ENDREGION} {$ENDREGION}
{$REGION ICEMultiDocObserver ---------------------------------------------------} {$REGION ICEMultiDocObserver ---------------------------------------------------}
@ -482,10 +496,11 @@ begin
case knd of case knd of
'alias' :ndCat := Tree.Items.AddChildObject(ndAlias, nme, ln); 'alias' :ndCat := Tree.Items.AddChildObject(ndAlias, nme, ln);
'class' :ndCat := Tree.Items.AddChildObject(ndClass, nme, ln); 'class' :ndCat := Tree.Items.AddChildObject(ndClass, nme, ln);
'enum' :ndCat := Tree.Items.AddChildObject(ndEnum, nme, ln); 'enum', 'enum member'
:ndCat := Tree.Items.AddChildObject(ndEnum, nme, ln);
'function' :ndCat := Tree.Items.AddChildObject(ndFunc, nme, ln); 'function' :ndCat := Tree.Items.AddChildObject(ndFunc, nme, ln);
'import', 'static import': 'import', 'static import'
ndCat := Tree.Items.AddChildObject(ndImp, nme, ln); :ndCat := Tree.Items.AddChildObject(ndImp, nme, ln);
'interface' :ndCat := Tree.Items.AddChildObject(ndIntf, nme, ln); 'interface' :ndCat := Tree.Items.AddChildObject(ndIntf, nme, ln);
'mixin' :ndCat := Tree.Items.AddChildObject(ndMix, nme, ln); 'mixin' :ndCat := Tree.Items.AddChildObject(ndMix, nme, ln);
'struct' :ndCat := Tree.Items.AddChildObject(ndStruct, nme, ln); 'struct' :ndCat := Tree.Items.AddChildObject(ndStruct, nme, ln);