Incorrect mapping for BEGIN and appropriate END keyword

[gal20040]

Description of the Issue

There is incorrect mapping for BEGIN and appropriate END keyword.

Steps to Reproduce the Issue

1.Check the following sql code

if (1=1)
begin
	select getdate() --1

	if (2=2)
	begin
		select getdate() --2
		
		if (3=3)
		begin
			select getdate() --3
		end
		
		select getdate() --4
	end

	select getdate() --5
end

2. Try to collapse outer BEGIN-END block by clicking '-' near BEGIN.

Expected Behavior

All code inside outer BEGIN-END block should be hide:

Actual Behavior

There is incorrect hiding of code between outer BEGIN and inner END:

[gal20040]

Just to compare with actual correct behaviour in SSMS:

[nyamatongwe]

Equivalent case:

select getdate()
begin
begin
end
end

The problem is that the select statement isn't seen as terminated so sqlStatesCurrentLine is MASK_INTO_SELECT_STATEMENT_OR_ASSIGNEMENT (0x200) for the rest of the file causing a double decrement at each end.

Adding a ; to the select select getdate(); gets it treated as terminated and the folds work.

[gal20040]

Adding a ; to the select select getdate(); gets it treated as terminated and the folds work.

Thanks for it! Good point!

[nyamatongwe]

The sql lexer is most targeted at Oracle's SQL variant which requires semi-colons. Not handling invalid code isn't really a bug.
https://docs.oracle.com/cd/B14117_01/server.101/b10759/statements_10002.htm#SQLRF01702

There are other SQL variant lexers: mysql for MySQL and mssql for Microsoft SQL Server.

Here's the mssql lexer:

[nyamatongwe]

Closing. ; should be added for sql and mssql can be used when appropriate.