Skip to content

Commit 486fe2b

Browse files
committed
rename and modernize
1 parent cc4c855 commit 486fe2b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1280
-1790
lines changed

Project/Sources/Classes/beautifier.4dm

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ Class constructor()
175175

176176
This:C1470.specialComments:="%}])" // Compilation modifier & …
177177

178+
This:C1470.beautify()
179+
178180
// === === === === === === === === === === === === === === === === === === === === === === === === === ===
179181
Function beautify()
180182

@@ -246,7 +248,8 @@ An empty line is ignored if:
246248
If (This:C1470.options.aLineOfCommentsMustBePrecededByALineBreak\
247249
&& (This:C1470.lineIndex>0)\
248250
&& This:C1470.isNotEmpty(This:C1470.previousLine)\
249-
&& This:C1470.isNotComment(This:C1470.previousLine))
251+
&& This:C1470.isNotComment(This:C1470.previousLine)\
252+
&& This:C1470.isNotReservedComment($line))
250253

251254
This:C1470._ouput.push("")
252255

@@ -551,7 +554,8 @@ Function after() : Text
551554
End if
552555

553556
// MARK: Delete empty lines at the beginning of the method
554-
If (This:C1470.options.removeEmptyLinesAtTheBeginOfMethod)
557+
If (This:C1470.options.removeEmptyLinesAtTheBeginOfMethod)\
558+
&& (This:C1470._ouput.length>0)
555559

556560
While (This:C1470._ouput[0]="")
557561

@@ -561,7 +565,8 @@ Function after() : Text
561565
End if
562566

563567
// MARK: Remove empty lines at the end of the method
564-
If (This:C1470.options.removeEmptyLinesAtTheEndOfMethod)
568+
If (This:C1470.options.removeEmptyLinesAtTheEndOfMethod)\
569+
&& (This:C1470._ouput.length>0)
565570

566571
$indx:=This:C1470._ouput.length-1
567572

0 commit comments

Comments
 (0)