From 0d5eff4c8f21d251cb535414900b8814f45b7b33 Mon Sep 17 00:00:00 2001 From: Sergey Fedchenko Date: Thu, 20 Feb 2020 10:44:30 +0100 Subject: [PATCH] checkers: add draw.Draw to draw.DrawMask checker (#904) Fixes #819 --- checkers/testdata/wrapperFunc/negative_tests.go | 10 ++++++++-- checkers/testdata/wrapperFunc/positive_tests.go | 7 ++++++- checkers/wrapperFunc_checker.go | 5 +++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/checkers/testdata/wrapperFunc/negative_tests.go b/checkers/testdata/wrapperFunc/negative_tests.go index f1267636f..6fee0dbea 100644 --- a/checkers/testdata/wrapperFunc/negative_tests.go +++ b/checkers/testdata/wrapperFunc/negative_tests.go @@ -2,12 +2,14 @@ package checker_test import ( "bytes" + "image" + "image/draw" "net/http" "strings" "sync" ) -func appliedSuggestions(s string, b []byte) { +func appliedSuggestions(s string, b []byte, i draw.Image, r image.Rectangle, p image.Point, o draw.Op) { var wg sync.WaitGroup wg.Done() wg.Add(1) @@ -28,9 +30,11 @@ func appliedSuggestions(s string, b []byte) { bytes.ReplaceAll(b, b, b) _ = http.NotFoundHandler() + + draw.Draw(i, r, i, p, o) } -func nonMatchingArgs(s string, b []byte) { +func nonMatchingArgs(s string, b []byte, i draw.Image, r image.Rectangle, p image.Point, o draw.Op) { var wg sync.WaitGroup wg.Add(1) @@ -45,4 +49,6 @@ func nonMatchingArgs(s string, b []byte) { bytes.Replace(b, b, b, 1) _ = http.HandlerFunc(nil) + + draw.DrawMask(i, r, i, p, i, image.Point{}, o) } diff --git a/checkers/testdata/wrapperFunc/positive_tests.go b/checkers/testdata/wrapperFunc/positive_tests.go index 2db53b98a..6d753f18b 100644 --- a/checkers/testdata/wrapperFunc/positive_tests.go +++ b/checkers/testdata/wrapperFunc/positive_tests.go @@ -2,13 +2,15 @@ package checker_test import ( "bytes" + "image" + "image/draw" "net/http" "strings" "sync" "unicode" ) -func f(s string, b []byte) { +func f(s string, b []byte, i draw.Image, r image.Rectangle, p image.Point, o draw.Op) { var wg sync.WaitGroup /*! use WaitGroup.Done method in `wg.Add(-1)` */ wg.Add(-1) @@ -41,4 +43,7 @@ func f(s string, b []byte) { /*! use http.NotFoundHandler method in `http.HandlerFunc(http.NotFound)` */ _ = http.HandlerFunc(http.NotFound) + + /*! use draw.Draw method in `draw.DrawMask(i, r, i, p, nil, image.Point{}, o)` */ + draw.DrawMask(i, r, i, p, nil, image.Point{}, o) } diff --git a/checkers/wrapperFunc_checker.go b/checkers/wrapperFunc_checker.go index bba82e5ee..8f2d06c59 100644 --- a/checkers/wrapperFunc_checker.go +++ b/checkers/wrapperFunc_checker.go @@ -81,6 +81,11 @@ func init() { "bytes.Map => bytes.ToTitle": { {0, "unicode.ToTitle"}, }, + + "draw.DrawMask => draw.Draw": { + {4, "nil"}, + {5, "image.Point{}"}, + }, } matchers := make(map[string]*matcher)