administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix #1767

Browse source
This commit is contained in:
Бондарев Иван 2019-02-27 20:48:53 +01:00
parent d5745f815a
commit 18c956b1b5
3 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CodeCompletion/CodeFormatter.cs
View file

@ -543,16 +543,18 @@ namespace CodeFormatters
if (comm.StartsWith(" "))
{
if (trimed_comm == "then" || trimed_comm == "do")
if (trimed_comm == "then" || trimed_comm == "do" || trimed_comm == "of")
{
comm = comm.TrimStart(' ');
if (comm.Length == 0 || char.IsLetterOrDigit(comm[0]) || add_space_after)
comm = " " + comm;
}
}
if (comm.EndsWith(" ") && (comm.TrimEnd(' ').EndsWith("class") || comm.TrimEnd(' ').EndsWith("static")))
if (comm.EndsWith(" "))
{
comm = comm.TrimEnd(' ')+" ";
string trimed_end = comm.TrimEnd(' ');
if (trimed_end.EndsWith("class") || trimed_end.EndsWith("static") || trimed_end.EndsWith("else"))
comm = comm.TrimEnd(' ')+" ";
}
if (comm.Replace(" ","") == "():")//special case: functions with no parameters
{
@ -589,6 +591,7 @@ namespace CodeFormatters
comm = RemoveOverSpaces(comm);
else if (trimed_comm.StartsWith("]") && trimed_comm.EndsWith(":"))
comm = comm.Replace(" ", "");
}
WriteCommentWithIndent(comm, true);
read_from_beg_pos = false;

7
TestSuite/formatter_tests/input/case7.pas Normal file
View file

@ -0,0 +1,7 @@
begin
case 0 of
0 .. 1 , 2 .. 3 : exit ;
4 .. 5 , 6 .. 7 : exit ;
else exit ;
end;
end.

7
TestSuite/formatter_tests/should/case7.pas Normal file
View file

@ -0,0 +1,7 @@
begin
case 0 of
0..1, 2..3: exit;
4..5, 6..7: exit;
else exit;
end;
end.