Fold a VHDL "entity" on the first line of the file.

1 files changed, 5 insertions, 3 deletions

diff --git a/lexers/LexVHDL.cxx b/lexers/LexVHDL.cxx
index 5fa428bce..a1d75b277 100644
--- a/lexers/LexVHDL.cxx
+++ b/lexers/LexVHDL.cxx
@@ -398,15 +398,17 @@ static void FoldNoBoxVHDLDoc(
             strcmp(s, "entity") == 0         ||
             strcmp(s, "configuration") == 0 )
           {
-            if (strcmp(prevWord, "end") != 0 && lastStart)
+            if (strcmp(prevWord, "end") != 0)
             { // check for instantiated unit by backward searching for the colon.
               Sci_PositionU pos = lastStart;
-              char chAtPos, styleAtPos;
+              char chAtPos=0, styleAtPos;
               do{// skip white spaces
+                if(!pos)
+                  break;
                 pos--;
                 styleAtPos = styler.StyleAt(pos);
                 chAtPos = styler.SafeGetCharAt(pos);
-              }while(pos>0 &&
+              }while(pos &&
                      (chAtPos == ' ' || chAtPos == '\t' ||
                       chAtPos == '\n' || chAtPos == '\r' ||
                       IsCommentStyle(styleAtPos)));