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 61d53b2

Browse files
Add new Markdown source file type.
Added sfMarkdown element to TSourceFileType enumerated type. The new sfMarkdown element broke TSaveSnippetMgr.GetFileTypeDesc and TSaveUnitMgr.GetFileTypeDesc which assumed that all TSourceFileType values were supported, and so don't check for any file type that may not be supported. To enable such checks to be made a new TSourceFileInfo.SupportsFileType method was added to check if a file type is supported. Updated the Code Formatting tab of the Preferences dialogue box with the options to set Markdown as the default source file type.
1 parent 6934645 commit 61d53b2

File tree

5 files changed

+37
-10
lines changed

5 files changed

+37
-10
lines changed

‎Src/FrSourcePrefs.pas

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,14 @@ implementation
127127
sRTFFileDesc = 'Rich text';
128128
sPascalFileDesc = 'Pascal';
129129
sTextFileDesc = 'Plain text';
130+
sMarkdownFileDesc = 'Markdown';
130131

131132

132133
const
133134
// Maps source code file types to descriptions
134135
cFileDescs: array[TSourceFileType] of string = (
135-
sTextFileDesc, sPascalFileDesc, sHTML5FileDesc, sXHTMLFileDesc, sRTFFileDesc
136+
sTextFileDesc, sPascalFileDesc, sHTML5FileDesc, sXHTMLFileDesc,
137+
sRTFFileDesc, sMarkdownFileDesc
136138
);
137139

138140

‎Src/USaveSnippetMgr.pas

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,12 @@ function TSaveSnippetMgr.GetFileTypeDesc(
171171
const FileType: TSourceFileType): string;
172172
const
173173
Descriptions: array[TSourceFileType] of string = (
174-
sTxtExtDesc, sIncExtDesc, sHtml5ExtDesc, sXHtmExtDesc, sRtfExtDesc
174+
sTxtExtDesc, sIncExtDesc, sHtml5ExtDesc, sXHtmExtDesc, sRtfExtDesc,
175+
'' {Markdown not supported}
175176
);
176177
begin
178+
Assert(FileType <> sfMarkdown,
179+
ClassName + '.GetFileTypeDesc: Markdown not supported');
177180
Result := Descriptions[FileType];
178181
end;
179182

‎Src/USaveSourceMgr.pas

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,14 @@ procedure TSaveSourceMgr.DoExecute;
181181
begin
182182
// Set up dialog box
183183
fSaveDlg.Filter := fSourceFileInfo.FilterString;
184-
fSaveDlg.FilterIndex := FilterDescToIndex(
185-
fSaveDlg.Filter,
186-
fSourceFileInfo.FileTypeInfo[Preferences.SourceDefaultFileType].DisplayName,
187-
1
188-
);
184+
if fSourceFileInfo.SupportsFileType(Preferences.SourceDefaultFileType) then
185+
fSaveDlg.FilterIndex := FilterDescToIndex(
186+
fSaveDlg.Filter,
187+
fSourceFileInfo.FileTypeInfo[Preferences.SourceDefaultFileType].DisplayName,
188+
1
189+
)
190+
else
191+
fSaveDlg.FilterIndex := 1;
189192
fSaveDlg.FileName := fSourceFileInfo.DefaultFileName;
190193
// Display dialog box and save file if user OKs
191194
if fSaveDlg.Execute then
@@ -317,7 +320,8 @@ procedure TSaveSourceMgr.PreviewHandler(Sender: TObject);
317320
dtPlainText, // sfPascal
318321
dtHTML, // sfHTML5
319322
dtHTML, // sfXHTML
320-
dtRTF // sfRTF
323+
dtRTF, // sfRTF
324+
dtPlainText // sfMarkdown
321325
);
322326
PreviewFileTypeMap: array[TPreviewDocType] of TSourceFileType = (
323327
sfText, // dtPlainText

‎Src/USaveUnitMgr.pas

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,12 @@ function TSaveUnitMgr.GetDocTitle: string;
242242
function TSaveUnitMgr.GetFileTypeDesc(const FileType: TSourceFileType): string;
243243
const
244244
Descriptions: array[TSourceFileType] of string = (
245-
sTextDesc, sPascalDesc, sHTML5Desc, sXHTMLDesc, sRTFDesc
245+
sTextDesc, sPascalDesc, sHTML5Desc, sXHTMLDesc, sRTFDesc,
246+
'' {Markdown not supported}
246247
);
247248
begin
249+
Assert(FileType <> sfMarkdown,
250+
ClassName + '.GetFileTypeDesc: Markdown not supported');
248251
Result := Descriptions[FileType];
249252
end;
250253

‎Src/USourceFileInfo.pas

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ interface
3232
sfPascal, // pascal files (either .pas for units or .inc for include files
3333
sfHTML5, // HTML 5 files
3434
sfXHTML, // XHTML files
35-
sfRTF // rich text files
35+
sfRTF, // rich text files
36+
sfMarkdown // Markdown files
3637
);
3738

3839
type
@@ -132,13 +133,21 @@ TSourceFileInfo = class(TObject)
132133
/// given one-based index within the current filter string.</summary>
133134
function FileTypeFromFilterIdx(const Idx: Integer): TSourceFileType;
134135

136+
/// <summary>Checks if a file type is supported.</summary>
137+
/// <param name="FileType"><c>TSourceFileType</c> [in] File type to check.
138+
/// </param>
139+
/// <returns><c>Boolean</c>. <c>True</c> if file type is supported,
140+
/// <c>False</c> if not.</returns>
141+
function SupportsFileType(const FileType: TSourceFileType): Boolean;
142+
135143
/// <summary>Information about each supported file type that is of use to
136144
/// save source dialog boxes.</summary>
137145
/// <exception>A <c>EListError</c> exception is raised if no information
138146
/// relating to <c>FileType</c> has been stored in this property.
139147
/// </exception>
140148
property FileTypeInfo[const FileType: TSourceFileType]: TSourceFileTypeInfo
141149
read GetFileTypeInfo write SetFileTypeInfo;
150+
142151
/// <summary>Default source code file name.</summary>
143152
/// <remarks>Must be a valid Pascal identifier. Invalid characters are
144153
/// replaced by underscores.</remarks>
@@ -243,6 +252,12 @@ procedure TSourceFileInfo.SetFileTypeInfo(const FileType: TSourceFileType;
243252
GenerateFilterInfo;
244253
end;
245254

255+
function TSourceFileInfo.SupportsFileType(const FileType: TSourceFileType):
256+
Boolean;
257+
begin
258+
Result := fFileTypeInfo.ContainsKey(FileType);
259+
end;
260+
246261
{ TSourceFileTypeInfo }
247262

248263
constructor TSourceFileTypeInfo.Create(const AExtension, ADisplayName: string;

0 commit comments

Comments
(0)

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