From f4f04da00a0e9fa577674474dd495346d67b356a Mon Sep 17 00:00:00 2001 From: Neil Date: Mon, 11 May 2015 19:28:25 +1000 Subject: Folder folds units declarations and fixes a case insensitivity bug with not treating "IS" the same as "is". --- lexers/LexVHDL.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lexers') diff --git a/lexers/LexVHDL.cxx b/lexers/LexVHDL.cxx index 35383f3d8..56426e43f 100644 --- a/lexers/LexVHDL.cxx +++ b/lexers/LexVHDL.cxx @@ -216,7 +216,7 @@ static void FoldNoBoxVHDLDoc( // don't check if the style for the keywords that I use to adjust the levels. char words[] = "architecture begin block case component else elsif end entity generate loop package process record then " - "procedure function when"; + "procedure function when units"; WordList keywords; keywords.Set(words); @@ -382,7 +382,8 @@ static void FoldNoBoxVHDLDoc( strcmp(s, "package") ==0 || strcmp(s, "process") == 0 || strcmp(s, "record") == 0 || - strcmp(s, "then") == 0) + strcmp(s, "then") == 0 || + strcmp(s, "units") == 0) { if (strcmp(prevWord, "end") != 0) { @@ -437,7 +438,7 @@ static void FoldNoBoxVHDLDoc( (!IsCommentStyle(styleAtPos)) && (styleAtPos != SCE_VHDL_STRING) && !iswordchar(styler.SafeGetCharAt(pos-1)) && - styler.Match(pos, "is") && + (chAtPos|' ')=='i' && (styler.SafeGetCharAt(pos+1)|' ')=='s' && !iswordchar(styler.SafeGetCharAt(pos+2))) { if (levelMinCurrentElse > levelNext) { -- cgit v1.2.3