paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-26 03:59:10 +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;
end;
function TCustomCodeTool.AtomIsIdentifierE(ExceptionOnNotFound: boolean
): boolean;
function TCustomCodeTool.AtomIsIdentifierE(ExceptionOnNotFound: boolean): boolean;
begin
if InternalAtomIsIdentifier then exit(true);
Result:=false;

6
components/codetools/pascalparsertool.pas
View File

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

3
designer/controlselection.pp
View File

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

9
ide/customformeditor.pp
View File

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

15
ide/diffdialog.pas
View File

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

10
ide/diskdiffsdialog.pas
View File

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

4
ide/main.pp
View File

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