Wrongly highlighted and outlined code at some settings

Original Reporter info from Mantis: Blaazen @Blaazen

• Reporter name: Vojtech Cihak

Description:

Code in Source Editor is highlighted wrongly in some specific settings.
This issue is not about highlighting of else/otherwise inside case..of statement.

var i: Integer;
begin
  case i of
    0: ;
    1: ;
    otherwise ;
  end;
  begin case i of
          0: ;
          1: ;
          else ;
        end;
  end;
  begin case i of
          0: ;
          1: ;
          otherwise ;
        end;
  end;
end;

Steps to reproduce:

See attachments. Settings and issue are:
1)
procedure: Markup
begin/end (procedure): Markup & Outline
begin/end (nested): Markup & Outline
case: Off

issue: "begins" are wrongly paired with "ends" of case..of statements.

2. 
   

procedure: Markup & Outline
begin/end (procedure): Markup
begin/end (nested): Markup & Outline
case: Markup & Outline

issue: the last "end" is highlighted and the outline(s) are on bad position

Additional information:

Lazarus 2.1.0 r59293M FPC 3.3.1 x86_64-linux-qt

Mantis conversion info:

• Mantis ID: 34410
• OS: Linux
• OS Build: Chakra 64-bit
• Build: 59293
• Platform: amd64
• Version: 1.9 (SVN)