add a newline

formatter/body.go

@@ -168,10 +168,33 @@ func (b *body) Format(c *Config, p printer, w io.Writer) error {
 }
 
 func isSemanticNewline(prev statement, cur statement) bool {
-	if prev != nil {
-		if cur.TypeOf() == tsReturn && prev.TypeOf() != tsNewline && prev.TypeOf() != tsComment {
-			return true
-		}
+	if prev == nil {
+		return false
+	}
+
+	if prev.TypeOf() == tsNewline || prev.TypeOf() == tsComment {
+		return false
+	}
+
+	if cur.TypeOf() == tsReturn {
+		// always before tsAssignment
+		return true
+	}
+
+	if prev.TypeOf() == tsAssignment {
+		return false
+	}
+
+	if cur.TypeOf() == tsFunction {
+		return true
+	}
+
+	if cur.TypeOf() == tsIfStatement {
+		return true
+	}
+
+	if cur.TypeOf() == tsAssignment {
+		return true
 	}
 
 	return false

formatter/document.go

@@ -48,6 +48,7 @@ const (
 	tsReturn
 	tsNewline
 	tsComment
+	tsIfStatement
 )
 
 // chunk ::= block

formatter/exp.go

@@ -524,17 +524,13 @@ func (s *exp) Format(c *Config, p printer, w io.Writer) error {
 		}
 
 		if s.Binop.Token.Type == nConcat {
-			curpos, ok := w.(cursorPositioner)
-			if !ok {
-				return nil
-			}
-
 			buf := bytes.NewBuffer(nil)
 			if err := s.Exp.Format(c, p, buf); err != nil {
 				return err
 			}
 
-			if curpos.Cursor().Col+uint64(buf.Len()) > uint64(c.MaxLineLength) {
+			curpos := getCursorPosition(w)
+			if curpos.Col+uint64(buf.Len()) > uint64(c.MaxLineLength) {
 				if err := newLine(w); err != nil {
 					return err
 				}

formatter/fieldlist.go

@@ -193,11 +193,7 @@ type fieldLength struct {
 }
 
 func (s *fieldlist) isInline(c *Config, p printer, w io.Writer) bool {
-	var curpos cursorPosition
-
-	if v, ok := w.(cursorPositioner); ok {
-		curpos = v.Cursor()
-	}
+	curpos := getCursorPosition(w)
 
 	buf := bytes.NewBuffer([]byte("{}"))
 

formatter/statement_if.go

@@ -31,7 +31,7 @@ func (ifStatement) InnerStatement(prev, cur *element) (bool, statement) {
 }
 
 func (ifStatement) TypeOf() typeStatement {
-	return tsNone
+	return tsIfStatement
 }
 
 func (s *ifStatement) IsEnd(prev, cur *element) (bool, bool) {

tests/default/0004.lua.fmt

@@ -17,5 +17,6 @@ else
         return 4
     end
 end
+
 c = b()
 print(c)

tests/default/0005.lua.fmt

@@ -97,6 +97,7 @@ local vehicles = load_vehicles_from_disk("vehicles.dat")
 
 if vehicles["Porsche"] then
     porsche_handler(vehicles["Porsche"])
+
     vehicles["Porsche"] = nil
 end
 

tests/default/0007.lua.fmt

@@ -34,6 +34,7 @@ end
 local function foo()
     -- code
 end
+
 local function bar()
     -- code
 end