paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-27 11:40:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Formatting.

Browse Source 
git-svn-id: trunk@57120 -
This commit is contained in:
juha 2018-01-19 12:12:42 +00:00
parent 4a92f982c4
commit 1cefe1d894
7 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/codetools/customcodetool.pas
View File

@ -785,8 +785,7 @@ begin
RaiseAtomFound; RaiseAtomFound;
end; end;
function TCustomCodeTool.AtomIsIdentifierE(ExceptionOnNotFound: boolean function TCustomCodeTool.AtomIsIdentifierE(ExceptionOnNotFound: boolean): boolean;
): boolean;
begin begin
if InternalAtomIsIdentifier then exit(true); if InternalAtomIsIdentifier then exit(true);
Result:=false; Result:=false;

6
components/codetools/pascalparsertool.pas
View File

@ -1395,8 +1395,7 @@ var CloseBracket: char;
ReadNextAtom ReadNextAtom
else else
ExtractNextAtom([phpWithDefaultValues,phpWithHasDefaultValues]*Attr<>[],Attr); ExtractNextAtom([phpWithDefaultValues,phpWithHasDefaultValues]*Attr<>[],Attr);
ReadConstant(ExceptionOnError, ReadConstant(ExceptionOnError, Extract and (phpWithDefaultValues in Attr), Attr);
Extract and (phpWithDefaultValues in Attr),Attr);
if (phpCreateNodes in Attr) then begin if (phpCreateNodes in Attr) then begin
Node:=CurNode; Node:=CurNode;
Node.SubDesc:=Node.SubDesc+ctnsHasDefaultValue; Node.SubDesc:=Node.SubDesc+ctnsHasDefaultValue;
@ -1499,8 +1498,7 @@ begin
// read default value // read default value
ReadDefaultValue; ReadDefaultValue;
end; end;
end else if (CurPos.Flag in [cafSemicolon,cafRoundBracketClose, end else if (CurPos.Flag in [cafSemicolon,cafRoundBracketClose,cafEdgedBracketClose])
cafEdgedBracketClose])
then begin then begin
// no type -> variant // no type -> variant
if (phpCreateNodes in Attr) then begin if (phpCreateNodes in Attr) then begin

3
designer/controlselection.pp
View File

@ -2289,7 +2289,8 @@ begin
FControls.Delete(Index); FControls.Delete(Index);
FStates:=FStates+cssSelectionChangeFlags; FStates:=FStates+cssSelectionChangeFlags;
if Count=0 then SetCustomForm; if Count=0 then
SetCustomForm;
UpdateBounds; UpdateBounds;
SaveBounds; SaveBounds;
DoChange; DoChange;

9
ide/customformeditor.pp
View File

@ -1867,10 +1867,8 @@ begin
try try
try try
DefinePropertiesReader:=TDefinePropertiesReader.Create; DefinePropertiesReader:=TDefinePropertiesReader.Create;
DefinePropertiesPersistent:= DefinePropertiesPersistent:=TDefinePropertiesPersistent.Create(APersistent);
TDefinePropertiesPersistent.Create(APersistent); DefinePropertiesPersistent.PublicDefineProperties(DefinePropertiesReader);
DefinePropertiesPersistent.PublicDefineProperties(
DefinePropertiesReader);
except except
on E: Exception do begin on E: Exception do begin
DbgOut('TCustomFormEditor.FindDefineProperty Error calling DefineProperties for '); DbgOut('TCustomFormEditor.FindDefineProperty Error calling DefineProperties for ');
@ -1897,8 +1895,7 @@ begin
if (DefinePropertiesReader<>nil) if (DefinePropertiesReader<>nil)
and (DefinePropertiesReader.DefinePropertyNames<>nil) then begin and (DefinePropertiesReader.DefinePropertyNames<>nil) then begin
CacheItem.DefineProperties:=TStringList.Create; CacheItem.DefineProperties:=TStringList.Create;
CacheItem.DefineProperties.Assign( CacheItem.DefineProperties.Assign(DefinePropertiesReader.DefinePropertyNames);
DefinePropertiesReader.DefinePropertyNames);
debugln('TCustomFormEditor.FindDefineProperty Class=',APersistentClassName, debugln('TCustomFormEditor.FindDefineProperty Class=',APersistentClassName,
' DefineProps="',CacheItem.DefineProperties.Text,'"'); ' DefineProps="',CacheItem.DefineProperties.Text,'"');
end; end;

15
ide/diffdialog.pas
View File

@ -39,10 +39,17 @@ unit DiffDialog;
interface interface
uses uses
Classes, SysUtils, Forms, Controls, Buttons, StdCtrls, FileUtil, Classes, SysUtils,
lazutf8classes, LazarusIDEStrConsts, EditorOptions, LCLType, IDEWindowIntf, // LCL
IDEHelpIntf, InputHistory, DiffPatch, ExtCtrls, Dialogs, ComCtrls, SynEdit, Forms, Controls, Buttons, StdCtrls, ExtCtrls, Dialogs, ComCtrls, LCLType,
IDEImagesIntf, SynHighlighterDiff, SourceEditor; // LazUtils
FileUtil, lazutf8classes,
// SynEdit
SynEdit, SynHighlighterDiff,
// IdeIntf
IDEWindowIntf, IDEHelpIntf, IDEImagesIntf,
// IDE
LazarusIDEStrConsts, EditorOptions, InputHistory, DiffPatch, SourceEditor;
type type

10
ide/diskdiffsdialog.pas
View File

@ -32,9 +32,10 @@ unit DiskDiffsDialog;
interface interface
uses uses
// RTL + FCL + LCL // RTL + FCL
Classes, SysUtils, LCLProc, Forms, Controls, StdCtrls, ExtCtrls, LCLType, Classes, SysUtils,
CheckLst, // LCL
LCLProc, LCLType, Forms, Controls, StdCtrls, ExtCtrls, CheckLst,
// CodeTools // CodeTools
FileProcs, CodeCache, FileProcs, CodeCache,
// LazUtils // LazUtils
@ -42,8 +43,7 @@ uses
// SynEdit // SynEdit
SynEdit, SynHighlighterDiff, SynEdit, SynHighlighterDiff,
// IDE // IDE
Project, DiffPatch, LazarusIDEStrConsts, EnvironmentOpts, EditorOptions, Project, PackageDefs, DiffPatch, LazarusIDEStrConsts, EnvironmentOpts, EditorOptions;
PackageDefs;
type type
PDiffItem = ^TDiffItem; PDiffItem = ^TDiffItem;

4
ide/main.pp
View File

@ -9405,8 +9405,8 @@ begin
end; end;
if Line=0 then if Line=0 then
SrcPosToLineCol(OldSource,length(OldSource),Line,Col); SrcPosToLineCol(OldSource,length(OldSource),Line,Col);
Msg:=Format(lisSavingFileAsLoosesCharactersAtLineColumn, [Filename, Code. Msg:=Format(lisSavingFileAsLoosesCharactersAtLineColumn,
DiskEncoding, IntToStr(Line), IntToStr(Col)]); [Filename, Code.DiskEncoding, IntToStr(Line), IntToStr(Col)]);
if IDEMessageDialog(lisInsufficientEncoding,Msg, if IDEMessageDialog(lisInsufficientEncoding,Msg,
mtWarning,[mbIgnore,mbCancel])<>mrIgnore mtWarning,[mbIgnore,mbCancel])<>mrIgnore
then begin then begin