mirror of
https://github.com/moparisthebest/Simba
synced 2025-03-03 02:41:54 -05:00
Merge branch 'master' of ssh://villavu.com:54367/simba
This commit is contained in:
commit
9235a38b95
@ -146,9 +146,8 @@ var
|
||||
sp, ep: Integer;
|
||||
begin
|
||||
mp := TCodeInsight.Create;
|
||||
{$IFDEF ciDEBUG}
|
||||
mp.FileName := ScriptFile;
|
||||
mp.OnMessage := @Form1.OnCCMessage;
|
||||
{$ENDIF}
|
||||
mp.OnFindInclude := @Form1.OnCCFindInclude;
|
||||
|
||||
ms := TMemoryStream.Create;
|
||||
@ -293,9 +292,7 @@ begin
|
||||
end;}
|
||||
mp := TCodeInsight.Create;
|
||||
mp.FileName := ScriptFile;
|
||||
{$IFDEF ciDEBUG}
|
||||
mp.OnMessage := @Form1.OnCCMessage;
|
||||
{$ENDIF}
|
||||
mp.OnFindInclude := @Form1.OnCCFindInclude;
|
||||
|
||||
ms := TMemoryStream.Create;
|
||||
|
@ -39,7 +39,7 @@
|
||||
<PackageName Value="LCL"/>
|
||||
</Item2>
|
||||
</RequiredPackages>
|
||||
<Units Count="33">
|
||||
<Units Count="46">
|
||||
<Unit0>
|
||||
<Filename Value="project1.lpr"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
@ -223,6 +223,70 @@
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="libloader"/>
|
||||
</Unit32>
|
||||
<Unit33>
|
||||
<Filename Value="../../Units/Misc/v_autocompleteform.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="v_AutoCompleteForm"/>
|
||||
</Unit33>
|
||||
<Unit34>
|
||||
<Filename Value="../../Units/Misc/v_ideCodeParser.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="v_ideCodeParser"/>
|
||||
</Unit34>
|
||||
<Unit35>
|
||||
<Filename Value="../../Units/Misc/ValistusDefines.inc"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
</Unit35>
|
||||
<Unit36>
|
||||
<Filename Value="../../Units/Misc/PSDump.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="PSDump"/>
|
||||
</Unit36>
|
||||
<Unit37>
|
||||
<Filename Value="../../Units/Misc/v_ideCodeInsight.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="v_ideCodeInsight"/>
|
||||
</Unit37>
|
||||
<Unit38>
|
||||
<Filename Value="../../Units/Misc/CastaliaPasLex.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="CastaliaPasLex"/>
|
||||
</Unit38>
|
||||
<Unit39>
|
||||
<Filename Value="../../Units/Misc/CastaliaPasLexTypes.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="CastaliaPasLexTypes"/>
|
||||
</Unit39>
|
||||
<Unit40>
|
||||
<Filename Value="../../Units/Misc/CastaliaSimplePasPar.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="CastaliaSimplePasPar"/>
|
||||
</Unit40>
|
||||
<Unit41>
|
||||
<Filename Value="../../Units/Misc/CastaliaSimplePasParTypes.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="CastaliaSimplePasParTypes"/>
|
||||
</Unit41>
|
||||
<Unit42>
|
||||
<Filename Value="../../Units/Misc/dcpbase64.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="dcpbase64"/>
|
||||
</Unit42>
|
||||
<Unit43>
|
||||
<Filename Value="../../Units/Misc/mPasLex.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="mPasLex"/>
|
||||
</Unit43>
|
||||
<Unit44>
|
||||
<Filename Value="../../Units/Misc/v_Constants.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="v_Constants"/>
|
||||
</Unit44>
|
||||
<Unit45>
|
||||
<Filename Value="../../Units/Misc/v_MiscFunctions.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="v_MiscFunctions"/>
|
||||
</Unit45>
|
||||
</Units>
|
||||
</ProjectOptions>
|
||||
<CompilerOptions>
|
||||
|
@ -33,7 +33,10 @@ uses
|
||||
{$ENDIF}{$ENDIF}
|
||||
Interfaces, Forms, testunit, colourhistory, About, internets, debugimage,
|
||||
framefunctionlist, simpleanalyzer, updater, updateform, simbasettings,
|
||||
libloader, mufasabase, extensionmanagergui;
|
||||
libloader, mufasabase, v_ideCodeInsight, PSDump, v_ideCodeParser,
|
||||
v_AutoCompleteForm, CastaliaPasLex, CastaliaPasLexTypes, CastaliaSimplePasPar,
|
||||
CastaliaSimplePasParTypes, dcpbase64, mPasLex, v_Constants, v_MiscFunctions,
|
||||
extensionmanagergui;
|
||||
|
||||
{$R project1.res}
|
||||
|
||||
|
@ -316,9 +316,7 @@ type
|
||||
procedure UpdateMenuButtonClick(Sender: TObject);
|
||||
procedure UpdateTimerCheck(Sender: TObject);
|
||||
|
||||
{$IFDEF ciDEBUG}
|
||||
procedure OnCCMessage(Sender: TObject; const Typ: TMessageEventType; const Msg: string; X, Y: Integer);
|
||||
{$ENDIF}
|
||||
procedure OnCompleteCode(Str: string);
|
||||
function OnCCFindInclude(Sender: TObject; var FileName: string): Boolean;
|
||||
private
|
||||
@ -440,7 +438,6 @@ end;
|
||||
var
|
||||
DebugCriticalSection: syncobjs.TCriticalSection;
|
||||
|
||||
{$IFDEF ciDEBUG}
|
||||
procedure TForm1.OnCCMessage(Sender: TObject; const Typ: TMessageEventType; const Msg: string; X, Y: Integer);
|
||||
begin
|
||||
if (Typ = meNotSupported) then
|
||||
@ -450,7 +447,6 @@ begin
|
||||
Exit;
|
||||
mDebugLn('ERROR: '+Format('%d:%d %s', [Y + 1, X, Msg])+' in '+TCodeInsight(Sender).FileName);
|
||||
end;
|
||||
{$ENDIF}
|
||||
|
||||
procedure TForm1.OnCompleteCode(Str: string);
|
||||
var
|
||||
@ -1779,9 +1775,7 @@ procedure TForm1.FormCreate(Sender: TObject);
|
||||
CoreBuffer[0] := TCodeInsight.Create;
|
||||
with CoreBuffer[0] do
|
||||
begin
|
||||
{$IFDEF ciDEBUG}
|
||||
OnMessage := @OnCCMessage;
|
||||
{$ENDIF}
|
||||
b.SaveToStream(ms);
|
||||
Run(ms, nil, -1, True);
|
||||
FileName := '!PSCORE!';
|
||||
|
@ -5,7 +5,6 @@
|
||||
{.$DEFINE ccFORMCAPTION}
|
||||
|
||||
{$DEFINE ciCHECKDUPLICATES}
|
||||
{$DEFINE ciDEBUG}
|
||||
{$DEFINE D8_NEWER1}
|
||||
{$DEFINE D9_NEWER}
|
||||
{$DEFINE D10_NEWER}
|
||||
|
@ -312,7 +312,7 @@ begin
|
||||
{$IFDEF FPC}UnlockSelectionChange;{$ENDIF}
|
||||
end;
|
||||
|
||||
if {$IFDEF FPC}(odPainted in State) or{$ENDIF} (not Visible) or (ARect.Left > ClientRect.Right) or (ARect.Top > ClientRect.Bottom) or (Index < 0) or (Index >= Items.Count) then
|
||||
if (not Visible) or (ARect.Left > ClientRect.Right) or (ARect.Top > ClientRect.Bottom) or (Index < 0) or (Index >= Items.Count) then
|
||||
Exit;
|
||||
|
||||
tl := ARect.Left;
|
||||
|
Loading…
x
Reference in New Issue
Block a user