Merge branch 'feature/102-iactivetext.isempty-not-reliable' into develop

Fixes #102

Author: delphidabbler

Src/ActiveText.UHTMLRenderer.pas

@@ -174,7 +174,7 @@ function TActiveTextHTML.Render(ActiveText: IActiveText): string;
   DestLines: IStringList;
   DestLine: string;
 begin
-  if ActiveText.IsEmpty then
+  if not ActiveText.HasContent then
     Exit('');
   Text := '';
   fLevel := 0;

Src/ActiveText.UMain.pas

@@ -190,6 +190,8 @@   TActiveTextAttrNames = record
     ///  <summary>Checks if the active text object contains any elements.
     ///  </summary>
     function IsEmpty: Boolean;
+    ///  <summary>Checks if the active text object has text content.</summary>
+    function HasContent: Boolean;
     ///  <summary>Checks if the active text object contains only plain text.
     ///  </summary>
     ///  <remarks>Plain text is considered to be active text with no action
@@ -504,6 +506,9 @@   TActiveText = class(TInterfacedObject,
     ///  <summary>Checks if the element list is empty.</summary>
     ///  <remarks>Method of IActiveText.</remarks>
     function IsEmpty: Boolean;
+    ///  <summary>Checks if the active text object has text content.</summary>
+    ///  <remarks>Method of IActiveText.</remarks>
+    function HasContent: Boolean;
     ///  <summary>Checks if the active text object contains only plain text.
     ///  </summary>
     ///  <remarks>
@@ -869,6 +874,18 @@ function TActiveText.GetEnumerator: TEnumerator<IActiveTextElem>;
   Result := fElems.GetEnumerator;
 end;
 
+function TActiveText.HasContent: Boolean;
+var
+  Elem: IActiveTextElem;
+  TextElem: IActiveTextTextElem;
+begin
+  Result := False;
+  for Elem in fElems do
+    if Supports(Elem, IActiveTextTextElem, TextElem)
+      and (TextElem.Text <> '') then
+      Exit(True);
+end;
+
 function TActiveText.IsEmpty: Boolean;
 begin
   Result := fElems.Count = 0;

Src/DBIO.UXMLDataIO.pas

@@ -950,7 +950,7 @@ procedure TXMLDataWriter.WriteSnippetProps(const SnippetName: string;
     );
     fXMLDoc.CreateElement(SnippetNode, cDisplayNameNode, Props.DisplayName);
     // extra node is only written if extra property has a value
-    if not Props.Extra.IsEmpty then
+    if Props.Extra.HasContent then
     begin
       fXMLDoc.CreateElement(
         SnippetNode,

Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas

@@ -257,7 +257,7 @@ procedure TSnippetsActiveTextEdFrame.SetActiveText(Value: IActiveText);
       SetEditMode(emREML)
   else
     SetEditMode(fDefaultEditMode);
-  if not Value.IsEmpty then
+  if Value.HasContent then
   begin
     case fEditMode of
       emPlainText:

Src/UCodeImportExport.pas

@@ -300,7 +300,7 @@ procedure TCodeExporter.WriteSnippet(const ParentNode: IXMLNode;
     SnippetNode, cHighlightSource, IntToStr(Ord(Snippet.HiliteSource))
   );
   // extra info is written only if present
-  if not Snippet.Extra.IsEmpty then
+  if Snippet.Extra.HasContent then
     fXMLDoc.CreateElement(
       SnippetNode,
       cExtraNode,

Src/UREMLDataIO.pas

@@ -735,7 +735,7 @@ class function TREMLWriter.Render(const ActiveText: IActiveText): string;
   DestLine: string;
   RW: TREMLWriter;
 begin
-  if ActiveText.IsEmpty then
+  if not ActiveText.HasContent then
     Exit('');
   RW := TREMLWriter.InternalCreate;
   try

Src/URTFSnippetDoc.pas

@@ -398,7 +398,8 @@ procedure TRTFSnippetDoc.RenderExtra(const ExtraText: IActiveText);
 var
   RTFWriter: TActiveTextRTF;  // Object that generates RTF from active text
 begin
-  Assert(not ExtraText.IsEmpty, ClassName + '.RenderExtra: ExtraText is empty');
+  Assert(ExtraText.HasContent,
+    ClassName + '.RenderExtra: ExtraText has no content');
   RTFWriter := TActiveTextRTF.Create;
   try
     RTFWriter.ElemStyleMap := fExtraStyles;

Src/USnippetDoc.pas

@@ -177,7 +177,7 @@ function TSnippetDoc.Generate(const Snippet: TSnippet): TEncodedData;
   RenderTitledList(sXRefListTitle, SnippetsToStrings(Snippet.XRef));
   if Snippet.Kind <> skFreeform then
     RenderCompilerInfo(sCompilers, CompilerInfo(Snippet));
-  if not Snippet.Extra.IsEmpty then
+  if Snippet.Extra.HasContent then
     RenderExtra(Snippet.Extra);
   if not Snippet.UserDefined then
     // database info written only if snippet is from main database

Src/UTextSnippetDoc.pas

@@ -154,7 +154,8 @@ procedure TTextSnippetDoc.RenderDescription(const Desc: IActiveText);
 
 procedure TTextSnippetDoc.RenderExtra(const ExtraText: IActiveText);
 begin
-  Assert(not ExtraText.IsEmpty, ClassName + '.RenderExtra: ExtraText is empty');
+  Assert(ExtraText.HasContent,
+    ClassName + '.RenderExtra: ExtraText has no content');
   fWriter.WriteLine;
   RenderActiveText(ExtraText);
 end;