Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 220b6ef

Browse files
Remove preferences dependency from USourceGen unit
Modified TSourceGen.UnitAsString to get information aboute compiler warnings via a new parameters instead of from the Preferences object. This was the only dependency on the Preferences object in the unit. Calling code was modified to pass the required warnings to TSourceGen.UnitAsString as a parameter. This calling code now gets the value from the preferences object. Fixes #167 
1 parent b25393c commit 220b6ef

File tree

3 files changed

+27
-10
lines changed

3 files changed

+27
-10
lines changed

‎Src/USaveUnitMgr.pas

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ function TSaveUnitMgr.GenerateSource(const CommentStyle: TCommentStyle;
217217
begin
218218
Result := fSourceGen.UnitAsString(
219219
UnitName,
220+
Preferences.Warnings,
220221
CommentStyle,
221222
TruncateComments,
222223
Preferences.TruncateSourceComments,

‎Src/USourceGen.pas

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,14 @@ interface
1818

1919
uses
2020
// Delphi
21-
Classes, Generics.Collections,
21+
Classes,
22+
Generics.Collections,
2223
// Project
23-
ActiveText.UMain, DB.USnippet, UBaseObjects, UIStringList;
24+
ActiveText.UMain,
25+
DB.USnippet,
26+
UBaseObjects,
27+
UIStringList,
28+
UWarnings;
2429

2530

2631
type
@@ -211,7 +216,7 @@ TSourceGen = class(TObject)
211216
/// <param name="HeaderComments"><c>IStringList</c> [in] List of comments
212217
/// to be included at top of unit.</param>
213218
/// <returns><c>string</c>. Unit source code.</returns>
214-
function UnitAsString(const UnitName: string;
219+
function UnitAsString(const UnitName: string;const Warnings: IWarnings;
215220
const CommentStyle: TCommentStyle = csNone;
216221
const TruncateComments: Boolean = False;
217222
const UseCommentsInImplementation: Boolean = False;
@@ -255,10 +260,16 @@ implementation
255260

256261
uses
257262
// Delphi
258-
SysUtils, Character,
263+
SysUtils,
264+
Character,
259265
// Project
260-
ActiveText.UTextRenderer, DB.USnippetKind, UConsts, UExceptions, UPreferences,
261-
USnippetValidator, UStrUtils, UWarnings, Hiliter.UPasLexer;
266+
ActiveText.UTextRenderer,
267+
DB.USnippetKind,
268+
UConsts,
269+
UExceptions,
270+
USnippetValidator,
271+
UStrUtils,
272+
Hiliter.UPasLexer;
262273

263274

264275
const
@@ -588,14 +599,14 @@ class function TSourceGen.IsFileNameValidUnitName(const FileName: string):
588599
end;
589600

590601
function TSourceGen.UnitAsString(const UnitName: string;
602+
const Warnings: IWarnings;
591603
const CommentStyle: TCommentStyle = csNone;
592604
const TruncateComments: Boolean = False;
593605
const UseCommentsInImplementation: Boolean = False;
594606
const HeaderComments: IStringList = nil): string;
595607
var
596608
Writer: TStringBuilder; // used to build source code string
597609
Snippet: TSnippet; // reference to a snippet object
598-
Warnings: IWarnings; // object giving info about any inhibited warnings
599610
ImplCommentStyle: TCommentStyle; // style of comments in implementation
600611
begin
601612
// Set comment style for implementation section
@@ -620,7 +631,6 @@ function TSourceGen.UnitAsString(const UnitName: string;
620631
Writer.AppendLine;
621632

622633
// any conditional compilation symbols
623-
Warnings := Preferences.Warnings;
624634
if Warnings.Enabled and not Warnings.IsEmpty then
625635
begin
626636
Writer.Append(Warnings.Render);

‎Src/UTestUnit.pas

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,13 @@ implementation
6565
// Delphi
6666
SysUtils,
6767
// Project
68-
DB.USnippetKind, UEncodings, UIOUtils, USourceGen, USystemInfo, UUnitAnalyser,
68+
DB.USnippetKind,
69+
UEncodings,
70+
UIOUtils,
71+
UPreferences,
72+
USourceGen,
73+
USystemInfo,
74+
UUnitAnalyser,
6975
UUtils;
7076

7177

@@ -89,7 +95,7 @@ function TTestUnit.GenerateUnitSource: string;
8995
Generator.IncludeSnippet(fSnippet);
9096
// Must use Self.UnitName below for Delphis that defined TObject.UnitName
9197
// otherwise the TObject version is used.
92-
Result := Generator.UnitAsString(Self.UnitName);
98+
Result := Generator.UnitAsString(Self.UnitName, Preferences.Warnings);
9399
finally
94100
Generator.Free;
95101
end;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /