Merge branch 'redundant-do-fix'

core/parse.go

@@ -756,6 +756,17 @@ func parseDef(obj Object, ctx *ParseContext, isForLinter bool) *DefExpr {
 	}
 }
 
+func skipRedundantDo(obj Object) bool {
+	if meta, ok := obj.(Meta); ok {
+		if m := meta.GetMeta(); m != nil {
+			if ok, res := m.Get(MakeKeyword("skip-redundant-do")); ok {
+				return res.Equals(Boolean{B: true})
+			}
+		}
+	}
+	return false
+}
+
 func parseBody(seq Seq, ctx *ParseContext) []Expr {
 	recur := ctx.recur
 	ctx.recur = false
@@ -772,7 +783,7 @@ func parseBody(seq Seq, ctx *ParseContext) []Expr {
 		if LINTER_MODE {
 			if defExpr, ok := expr.(*DefExpr); ok && !defExpr.isCreatedByMacro {
 				printParseWarning(defExpr.Pos(), "inline def")
-			} else if doExpr, ok := expr.(*DoExpr); ok && !doExpr.isCreatedByMacro {
+			} else if doExpr, ok := expr.(*DoExpr); ok && !doExpr.isCreatedByMacro && !skipRedundantDo(ro) {
 				printParseWarning(doExpr.Pos(), "redundant do form")
 			}
 		}
@@ -1208,6 +1219,9 @@ func fixInfo(obj Object, info *ObjectInfo) Object {
 			s = s.Rest()
 		}
 		res := NewListFrom(objs...)
+		if s, ok := obj.(Meta); ok {
+			res.meta = s.GetMeta()
+		}
 		if objInfo := obj.GetInfo(); objInfo != nil {
 			return res.WithInfo(objInfo)
 		}

core/read.go

@@ -745,6 +745,12 @@ func makeFnForm(args map[int]Symbol, body Object) Object {
 	for _, v := range a {
 		argVector = argVector.Conjoin(v)
 	}
+	if LINTER_MODE {
+		if meta, ok := body.(Meta); ok {
+			m := EmptyArrayMap().Plus(MakeKeyword("skip-redundant-do"), Boolean{B: true})
+			body = meta.WithMeta(m)
+		}
+	}
 	return DeriveReadObject(body, NewListFrom(MakeSymbol("joker.core/fn"), argVector, body))
 }
 

tests/linter/redundant-do/input.clj

@@ -23,3 +23,5 @@
 
 (when-let [a 1]
   (do 1 a))
+
+#(do (println 1) (println 2))