From fe195c67a9788cdc3c036cc08887edd2e3f56790 Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Mon, 18 Jul 2022 15:08:20 +0300 Subject: [PATCH 1/3] Generated go.sum and proto file detection --- data/generated.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/data/generated.go b/data/generated.go index 4052eec..48a3dd8 100644 --- a/data/generated.go +++ b/data/generated.go @@ -96,6 +96,9 @@ var GeneratedCodeNameMatchers = []GeneratedCodeNameMatcher{ // Poetry lock nameEndsWith("poetry.lock"), + + // go mod sum file + nameEndsWith("go.sum"), } // GeneratedCodeMatcher checks whether the file with the given data is @@ -113,6 +116,7 @@ var GeneratedCodeMatchers = []GeneratedCodeMatcher{ isGeneratedJavaScriptPEGParser, isGeneratedPostScript, isGeneratedGo, + isGeneratedProtobufFromGo, isGeneratedProtobuf, isGeneratedJavaScriptProtocolBuffer, isGeneratedApacheThrift, @@ -339,6 +343,24 @@ func isGeneratedGo(_, ext string, content []byte) bool { return false } +func isGeneratedProtobufFromGo(_, ext string, content []byte) bool { + if ext != ".proto" { + return false + } + lines := getLines(content, 20) + if len(lines) <= 1 { + return false + } + + for _, line := range lines { + if bytes.Contains(line, []byte("This file was autogenerated by go-to-protobuf")) { + return true + } + } + + return false +} + var protoExtensions = map[string]struct{}{ ".py": {}, ".java": {}, From a6f32e054cb2d77c04bd79a1ea0240288fe610cf Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Mon, 1 Aug 2022 21:06:24 +0300 Subject: [PATCH 2/3] Remove go.sum from generated --- data/generated.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/generated.go b/data/generated.go index 48a3dd8..0d490f3 100644 --- a/data/generated.go +++ b/data/generated.go @@ -96,9 +96,6 @@ var GeneratedCodeNameMatchers = []GeneratedCodeNameMatcher{ // Poetry lock nameEndsWith("poetry.lock"), - - // go mod sum file - nameEndsWith("go.sum"), } // GeneratedCodeMatcher checks whether the file with the given data is From 05907fe7ec4dea684a6b8735da8b36debd8693bf Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Mon, 1 Aug 2022 21:35:46 +0300 Subject: [PATCH 3/3] Change Yarn PnP regex to include all .pnp.* files --- data/generated.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/generated.go b/data/generated.go index 0d490f3..93d286c 100644 --- a/data/generated.go +++ b/data/generated.go @@ -74,7 +74,7 @@ var GeneratedCodeNameMatchers = []GeneratedCodeNameMatcher{ nameEndsWith("package-lock.json"), // Yarn plugnplay - nameMatches(`(^|\/)\.pnp\.(c|m)?js$`), + nameMatches(`(^|\/)\.pnp\..*$`), // Godeps nameContains("Godeps/"),