chore: switch to multiline function definition in resolver.go

.github/CODEOWNERS

@@ -1 +0,0 @@
-* @moul

.github/FUNDING.yml

@@ -1,6 +0,0 @@
-#github: ["moul"]
-patreon: moul
-open_collective: moul
-custom:
-- "https://www.buymeacoffee.com/moul"
-- "https://manfred.life/donate"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,31 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: "[BUG] "
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Type '....'
-3. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots / Logs**
-If applicable, add screenshots or logs to help explain your problem.
-
-**Versions (please complete the following information, if relevant):**
-- Software version: [e.g. v1.2.3, latest, building from sources]
-- OS: [e.g. Ubuntu, Mac, iOS, ...]
-- Golang version [e.g. 1.13]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/custom.md

@@ -1,8 +0,0 @@
----
-name: Custom
-about: 'Anything else: questions, discussions, thanks, ascii-arts, ...'
-title: ''
-labels: discussion
-assignees: moul
-
----

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[IDEA] "
-labels: enhancement
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +0,0 @@
-<!--
-Thank you for your contribution to this repo!
-
-Before submitting a pull request, please check the following:
-- reference any related issue, PR, link
-- use the "WIP" title prefix if you need help or more time to finish your PR
-
-you can remove this markdown comment
--->

.github/renovate.json

@@ -1,6 +0,0 @@
-{
-  "extends": [
-    "config:base"
-  ],
-  "groupName": "all"
-}

.github/workflows/release.yml

@@ -1,13 +0,0 @@
-name: Semantic Release
-
-on: push
-
-jobs:
-  semantic-release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-      - uses: codfish/semantic-release-action@v1
-        if: github.ref == 'refs/heads/master'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.golangci.yml

@@ -1,34 +0,0 @@
-run:
-  deadline: 1m
-  tests: false
-  #skip-files:
-  #  - ".*\\.gen\\.go"
-
-linters-settings:
-  golint:
-    min-confidence: 0
-  maligned:
-    suggest-new: true
-  goconst:
-    min-len: 5
-    min-occurrences: 4
-  misspell:
-    locale: US
-
-linters:
-  disable-all: true
-  enable:
-    - goconst
-    - misspell
-    - deadcode
-    - misspell
-    - structcheck
-    - errcheck
-    - unused
-    - varcheck
-    - staticcheck
-    - unconvert
-    - gofmt
-    - goimports
-    - golint
-    - ineffassign

.releaserc.js

@@ -1,8 +0,0 @@
-module.exports = {
-    branch: 'master',
-    plugins: [
-        '@semantic-release/commit-analyzer',
-        '@semantic-release/release-notes-generator',
-        '@semantic-release/github',
-    ],
-};

.travis.yml

@@ -3,14 +3,15 @@ go: 1.11.x
 go_import_path: moul.io/protoc-gen-gotemplate
 install:
 - go get github.com/Masterminds/glide
-- wget https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/v1.5.0/.travis/install-protoc.sh && chmod +x install-protoc.sh && ./install-protoc.sh 3.4.0
+- wget https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/master/.travis/install-protoc.sh && chmod +x install-protoc.sh && ./install-protoc.sh 3.4.0
 - go get -u github.com/golang/protobuf/protoc-gen-go
 - go get github.com/securego/gosec/cmd/gosec/...
-- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.12.2
+- go get -u github.com/alecthomas/gometalinter
+- gometalinter --install
 script:
 - make install
 - make test
-- PATH=$PATH:$(pwd)/bin make lint
+- make lint
 cache:
   directories:
   - $HOME/local

Makefile

@@ -33,4 +33,4 @@ docker.push: docker.build
 
 .PHONY: lint
 lint:
-	golangci-lint run --verbose . ./helpers ./cmd/...
+	gometalinter --disable-all --enable=errcheck --enable=vet --enable=vetshadow --enable=golint --enable=gosec --enable=ineffassign --enable=goconst --enable=goimports --enable=gofmt --exclude="Binds to all network interfaces" --exclude="should have comment" --enable=staticcheck --enable=gosimple --enable=misspell --deadline=120s . ./cmd/... ./helpers/...

README.md

@@ -76,57 +76,56 @@ This project uses [Masterminds/sprig](https://github.com/Masterminds/sprig) libr
 Non-exhaustive list of new helpers:
 
 * **all the functions from [sprig](https://github.com/Masterminds/sprig)**
-* `add`
+* `string`
-* `boolFieldExtension`
+* `json`
-* `camelCase`
+* `prettyjson`
-* `contains`
+* `splitArray`
-* `divide`
-* `fieldMapKeyType`
-* `fieldMapValueType`
 * `first`
-* `getEnumValue`
+* `last`
-* `getMessageType`
+* `upperFirst`
+* `lowerFirst`
+* `camelCase`
+* `lowerCamelCase`
+* `kebabCase`
+* `contains`
+* `trimstr`
+* `index`
+* `snakeCase`
 * `getProtoFile`
-* `goNormalize`
+* `getMessageType`
-* `goTypeWithPackage`
+* `getEnumValue`
+* `isFieldMessage`
+* `isFieldMessageTimeStamp`
+* `isFieldRepeated`
+* `haskellType`
 * `goType`
 * `goZeroValue`
-* `haskellType`
+* `goTypeWithPackage`
-* `httpBody`
+* `jsType`
+* `jsSuffixReserved`
+* `namespacedFlowType`
+* `httpVerb`
 * `httpPath`
 * `httpPathsAdditionalBindings`
-* `httpVerb`
+* `httpBody`
-* `index`
-* `int64FieldExtension`
-* `isFieldMap`
-* `isFieldMessageTimeStamp`
-* `isFieldMessage`
-* `isFieldRepeated`
-* `jsSuffixReserved`
-* `jsType`
-* `json`
-* `kebabCase`
-* `last`
-* `leadingComment`
-* `leadingDetachedComments`
-* `lowerCamelCase`
-* `lowerFirst`
-* `lowerGoNormalize`
-* `multiply`
-* `namespacedFlowType`
-* `prettyjson`
-* `replaceDict`
 * `shortType`
-* `snakeCase`
+* `urlHasVarsFromMessage`
-* `splitArray`
+* `lowerGoNormalize`
+* `goNormalize`
+* `leadingComment`
+* `trailingComment`
+* `leadingDetachedComments`
 * `stringFieldExtension`
 * `stringMethodOptionsExtension`
-* `string`
+* `boolFieldExtension`
+* `isFieldMap`
+* `fieldMapKeyType`
+* `fieldMapValueType`
+* `replaceDict`
+* `add`
 * `subtract`
-* `trailingComment`
+* `multiply`
-* `trimstr`
+* `divide`
-* `upperFirst`
-* `urlHasVarsFromMessage`
 
 See the project helpers for the complete list.
 
@@ -153,10 +152,6 @@ $> docker run --rm -v "$(pwd):$(pwd)" -w "$(pwd)" moul/protoc-gen-gotemplate -I.
 * [translator](https://github.com/moul/translator): Translator Micro-service using Gettext and Go-Kit
 * [acl](https://github.com/moul/acl): ACL micro-service (gRPC/protobuf + http/json)
 
-## See also
-
-* [pbhbs](https://github.com/gponsinet/pbhbs): protobuf gen based on handlebarjs template
-
 ## License
 
 MIT

assets/assets

@@ -1,6 +0,0 @@
-  /Users/moul/go/src/moul.io/protoc-gen-gotemplate/assets:
-  total used in directory 552 available 9223372036849978910
-  drwxr-xr-x   4 moul  staff     128 Dec  9 11:31 .
-  lrwxr-xr-x   1 moul  staff      33 Dec  9 11:31 .#web-editor.jpg -> moul@manfred-spacegray.local.9471
-  drwxr-xr-x  21 moul  staff     672 Sep 13 18:05 ..
-  -rw-r--r--@  1 moul  staff  280357 Oct 26  2017 web-editor.jpg

encoder.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/protoc-gen-go/descriptor"
-	plugin_go "github.com/golang/protobuf/protoc-gen-go/plugin"
+	"github.com/golang/protobuf/protoc-gen-go/plugin"
 
 	pgghelpers "moul.io/protoc-gen-gotemplate/helpers"
 )
@@ -210,8 +210,10 @@ func (e *GenericTemplateBasedEncoder) Files() []*plugin_go.CodeGeneratorResponse
 		case f := <-resultChan:
 			files = append(files, f)
 		case err = <-errChan:
-			panic(err)
 		}
 	}
+	if err != nil {
+		panic(err)
+	}
 	return files
 }

examples/go-kit/services/session/gen/endpoints/endpoints.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/go-kit/kit/endpoint"
-	oldcontext "golang.org/x/net/context"
 	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb"
+	oldcontext "golang.org/x/net/context"
 )
 
 var _ = endpoint.Chain

examples/go-kit/services/sprint/gen/endpoints/endpoints.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/go-kit/kit/endpoint"
-	oldcontext "golang.org/x/net/context"
 	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb"
+	oldcontext "golang.org/x/net/context"
 )
 
 var _ = endpoint.Chain

examples/go-kit/services/user/gen/endpoints/endpoints.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/go-kit/kit/endpoint"
-	oldcontext "golang.org/x/net/context"
 	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb"
+	oldcontext "golang.org/x/net/context"
 )
 
 var _ = endpoint.Chain

examples/import/output/output.go

@@ -2,25 +2,39 @@
 package company
 
 import (
-	"context"
-
 	"moul.io/protoc-gen-gotemplate/examples/import/output/models/article"
-	"moul.io/protoc-gen-gotemplate/examples/import/output/models/common"
+    "moul.io/protoc-gen-gotemplate/examples/import/output/models/common"
 )
 
 type Repository interface {
-	GetArticle(getarticle *common.GetArticle) (*company.Article, []*company.Storage, error)
+     GetArticle(getarticle *common.GetArticle ) (*company.Article, []*company.Storage,  error)
 }
 
+
+
+
+
+
+
 // ------------------------- Public SDK -----------------------------
 
-// GetArticle : proto: missing extension proto: missing extension
-func (sdk *Sdk) GetArticle(ctx context.Context,
-	getarticle *article.GetArticle, token, requestID string) (article *article.Article, storages []*article.GetArticleResponse_Storage, err error) {
 
-	out := &pb.GetArticleResponse{}
+
+
+
+
+
+// GetArticle : proto: missing extension proto: missing extension
+func (sdk *Sdk) GetArticle(ctx context.Context, 
+  getarticle *article.GetArticle, token, requestID string)(article *article.Article, storages []*article.GetArticleResponse_Storage, err error) {
+
+  out := &pb.GetArticleResponse{}
 	_ = out
 
-	return out.Article, out.Storages, nil
 
+  return out.Article, out.Storages, nil
+ 
 }
+
+ 
+ 

examples/single-package-mode/output/bbb/service.go

@@ -4,8 +4,8 @@ package bbb
 import (
 	"fmt"
 
-	"golang.org/x/net/context"
 	"moul.io/protoc-gen-gotemplate/examples/single-package-mode/output/aaa"
+	"golang.org/x/net/context"
 )
 
 type Service struct{}

examples/time/output/time.go

@@ -2,9 +2,9 @@
 package foo
 
 import (
-	"github.com/golang/protobuf/ptypes/timestamp"
+    "github.com/golang/protobuf/ptypes/timestamp"
 )
 
 type Repository interface {
-	GetFoo(timestamp *timestamp.Timestamp) (*timestamp.Timestamp, error)
+     GetFoo(timestamp *timestamp.Timestamp ) (*timestamp.Timestamp,  error)
-}
+}

go.mod

@@ -4,6 +4,10 @@ require (
 	github.com/Masterminds/semver v1.2.2 // indirect
 	github.com/Masterminds/sprig v2.14.1+incompatible
 	github.com/aokoli/goutils v0.0.0-20170502144750-e57d01ace047 // indirect
+	github.com/dgrijalva/jwt-go v0.0.0-20160621201154-c9eaceb2896d // indirect
+	github.com/go-kit/kit v0.0.0-20161109000648-9f5c614cd1e7 // indirect
+	github.com/go-logfmt/logfmt v0.3.0 // indirect
+	github.com/go-stack/stack v1.5.3 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
 	github.com/golang/protobuf v0.0.0-20161117033126-8ee79997227b
 	github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f // indirect
@@ -12,10 +16,14 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.2.2
 	github.com/huandu/xstrings v0.0.0-20151130125119-3959339b3335
 	github.com/imdario/mergo v0.0.0-20171009183408-7fe0c75c13ab // indirect
+	github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169 // indirect
+	github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
 	github.com/satori/go.uuid v1.1.0 // indirect
-	github.com/stretchr/testify v1.3.0 // indirect
+	github.com/spf13/cobra v0.0.3 // indirect
+	github.com/spf13/pflag v1.0.3 // indirect
 	golang.org/x/crypto v0.0.0-20170516161655-0fe963104e9d // indirect
-	golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect
+	golang.org/x/net v0.0.0-20170108160505-da2b4fa28524 // indirect
+	golang.org/x/text v0.0.0-20161216064924-a49bea13b776 // indirect
 	google.golang.org/genproto v0.0.0-20170517234824-bb3573be0c48
-	gopkg.in/yaml.v2 v2.2.2 // indirect
+	google.golang.org/grpc v1.0.4 // indirect
 )

go.sum

@@ -4,8 +4,10 @@ github.com/Masterminds/sprig v2.14.1+incompatible h1:rTHERm50Xp1Cbb8x7xBCeDp//jM
 github.com/Masterminds/sprig v2.14.1+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
 github.com/aokoli/goutils v0.0.0-20170502144750-e57d01ace047 h1:Bn0iqJ/349f606hR0juIGyheAI6+hyg9XUOLhN9udLo=
 github.com/aokoli/goutils v0.0.0-20170502144750-e57d01ace047/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/dgrijalva/jwt-go v0.0.0-20160621201154-c9eaceb2896d/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-kit/kit v0.0.0-20161109000648-9f5c614cd1e7/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-stack/stack v1.5.3/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/protobuf v0.0.0-20161117033126-8ee79997227b h1:fE/yi9pibxGEc0gSJuEShcsBXE2d5FW3OudsjE9tKzQ=
@@ -22,20 +24,18 @@ github.com/huandu/xstrings v0.0.0-20151130125119-3959339b3335 h1:KZOP9q7J/P4eMBi
 github.com/huandu/xstrings v0.0.0-20151130125119-3959339b3335/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo=
 github.com/imdario/mergo v0.0.0-20171009183408-7fe0c75c13ab h1:k/Biv+LJL35wkk0Hveko1nj7as4tSHkHdZaNlzn/gcQ=
 github.com/imdario/mergo v0.0.0-20171009183408-7fe0c75c13ab/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169/go.mod h1:glhvuHOU9Hy7/8PwwdtnarXqLagOX0b/TbZx2zLMqEg=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/satori/go.uuid v1.1.0 h1:B9KXyj+GzIpJbV7gmr873NsY6zpbxNy24CBtGrk7jHo=
 github.com/satori/go.uuid v1.1.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 golang.org/x/crypto v0.0.0-20170516161655-0fe963104e9d h1:qjfFh1YMn6m60QTGoG+IlwUMhNlXJbDyCa6EkHM/N2w=
 golang.org/x/crypto v0.0.0-20170516161655-0fe963104e9d/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
+golang.org/x/net v0.0.0-20170108160505-da2b4fa28524/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/text v0.0.0-20161216064924-a49bea13b776/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 google.golang.org/genproto v0.0.0-20170517234824-bb3573be0c48 h1:xfoW+Di7qQQUnjptcGb4/rpc701e3RvfNmaywfMxQVI=
 google.golang.org/genproto v0.0.0-20170517234824-bb3573be0c48/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+google.golang.org/grpc v1.0.4/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

helpers/helpers.go

@@ -94,15 +94,15 @@ var ProtoHelpersFuncMap = template.FuncMap{
 	"trimstr": func(cutset, s string) string {
 		return strings.Trim(s, cutset)
 	},
-	"index": func(array interface{}, i int) interface{} {
+	"index": func(array interface{}, i int32) interface{} {
 		slice := reflect.ValueOf(array)
 		if slice.Kind() != reflect.Slice {
 			panic("Error in index(): given a non-slice type")
 		}
-		if i < 0 || i >= slice.Len() {
+		if i < 0 || int(i) >= slice.Len() {
 			panic("Error in index(): index out of bounds")
 		}
-		return slice.Index(i).Interface()
+		return slice.Index(int(i)).Interface()
 	},
 	"add": func(a int, b int) int {
 		return a + b
@@ -146,14 +146,9 @@ var ProtoHelpersFuncMap = template.FuncMap{
 	"leadingComment":               leadingComment,
 	"trailingComment":              trailingComment,
 	"leadingDetachedComments":      leadingDetachedComments,
-	"stringFileOptionsExtension":   stringFileOptionsExtension,
-	"stringMessageExtension":       stringMessageExtension,
 	"stringFieldExtension":         stringFieldExtension,
-	"int64FieldExtension":          int64FieldExtension,
-	"int64MessageExtension":        int64MessageExtension,
 	"stringMethodOptionsExtension": stringMethodOptionsExtension,
 	"boolMethodOptionsExtension":   boolMethodOptionsExtension,
-	"boolMessageExtension":         boolMessageExtension,
 	"boolFieldExtension":           boolFieldExtension,
 	"isFieldMap":                   isFieldMap,
 	"fieldMapKeyType":              fieldMapKeyType,
@@ -161,8 +156,6 @@ var ProtoHelpersFuncMap = template.FuncMap{
 	"replaceDict":                  replaceDict,
 	"setStore":                     setStore,
 	"getStore":                     getStore,
-	"goPkg":                        goPkg,
-	"goPkgLastElement":             goPkgLastElement,
 }
 
 var pathMap map[interface{}]*descriptor.SourceCodeInfo_Location
@@ -289,12 +282,12 @@ func samePath(a, b []int32) bool {
 	return true
 }
 
-/*func findSourceInfoLocation(i interface{}) *descriptor.SourceCodeInfo_Location {
+func findSourceInfoLocation(i interface{}) *descriptor.SourceCodeInfo_Location {
 	if pathMap == nil {
 		return nil
 	}
 	return pathMap[i]
-}*/
+}
 
 func leadingComment(i interface{}) string {
 	loc := pathMap[i]
@@ -349,46 +342,6 @@ func stringMethodOptionsExtension(fieldID int32, f *descriptor.MethodDescriptorP
 	return *str
 }
 
-// stringFileOptionsExtension extracts file options of a string type.
-// To define your own extensions see:
-// https://developers.google.com/protocol-buffers/docs/proto#customoptions
-// Typically the fieldID of private extensions should be in the range:
-// 50000-99999
-func stringFileOptionsExtension(fieldID int32, f *descriptor.FileDescriptorProto) string {
-	if f == nil {
-		return ""
-	}
-	if f.Options == nil {
-		return ""
-	}
-	var extendedType *descriptor.FileOptions
-	var extensionType *string
-
-	eds := proto.RegisteredExtensions(f.Options)
-	if eds[fieldID] == nil {
-		ed := &proto.ExtensionDesc{
-			ExtendedType:  extendedType,
-			ExtensionType: extensionType,
-			Field:         fieldID,
-			Tag:           fmt.Sprintf("bytes,%d", fieldID),
-		}
-		proto.RegisterExtension(ed)
-		eds = proto.RegisteredExtensions(f.Options)
-	}
-
-	ext, err := proto.GetExtension(f.Options, eds[fieldID])
-	if err != nil {
-		return ""
-	}
-
-	str, ok := ext.(*string)
-	if !ok {
-		return ""
-	}
-
-	return *str
-}
-
 func stringFieldExtension(fieldID int32, f *descriptor.FieldDescriptorProto) string {
 	if f == nil {
 		return ""
@@ -424,111 +377,6 @@ func stringFieldExtension(fieldID int32, f *descriptor.FieldDescriptorProto) str
 	return *str
 }
 
-func int64FieldExtension(fieldID int32, f *descriptor.FieldDescriptorProto) int64 {
-	if f == nil {
-		return 0
-	}
-	if f.Options == nil {
-		return 0
-	}
-	var extendedType *descriptor.FieldOptions
-	var extensionType *int64
-
-	eds := proto.RegisteredExtensions(f.Options)
-	if eds[fieldID] == nil {
-		ed := &proto.ExtensionDesc{
-			ExtendedType:  extendedType,
-			ExtensionType: extensionType,
-			Field:         fieldID,
-			Tag:           fmt.Sprintf("varint,%d", fieldID),
-		}
-		proto.RegisterExtension(ed)
-		eds = proto.RegisteredExtensions(f.Options)
-	}
-
-	ext, err := proto.GetExtension(f.Options, eds[fieldID])
-	if err != nil {
-		return 0
-	}
-
-	i, ok := ext.(*int64)
-	if !ok {
-		return 0
-	}
-
-	return *i
-}
-
-func int64MessageExtension(fieldID int32, f *descriptor.DescriptorProto) int64 {
-	if f == nil {
-		return 0
-	}
-	if f.Options == nil {
-		return 0
-	}
-	var extendedType *descriptor.MessageOptions
-	var extensionType *int64
-
-	eds := proto.RegisteredExtensions(f.Options)
-	if eds[fieldID] == nil {
-		ed := &proto.ExtensionDesc{
-			ExtendedType:  extendedType,
-			ExtensionType: extensionType,
-			Field:         fieldID,
-			Tag:           fmt.Sprintf("varint,%d", fieldID),
-		}
-		proto.RegisterExtension(ed)
-		eds = proto.RegisteredExtensions(f.Options)
-	}
-
-	ext, err := proto.GetExtension(f.Options, eds[fieldID])
-	if err != nil {
-		return 0
-	}
-
-	i, ok := ext.(*int64)
-	if !ok {
-		return 0
-	}
-
-	return *i
-}
-
-func stringMessageExtension(fieldID int32, f *descriptor.DescriptorProto) string {
-	if f == nil {
-		return ""
-	}
-	if f.Options == nil {
-		return ""
-	}
-	var extendedType *descriptor.MessageOptions
-	var extensionType *string
-
-	eds := proto.RegisteredExtensions(f.Options)
-	if eds[fieldID] == nil {
-		ed := &proto.ExtensionDesc{
-			ExtendedType:  extendedType,
-			ExtensionType: extensionType,
-			Field:         fieldID,
-			Tag:           fmt.Sprintf("bytes,%d", fieldID),
-		}
-		proto.RegisterExtension(ed)
-		eds = proto.RegisteredExtensions(f.Options)
-	}
-
-	ext, err := proto.GetExtension(f.Options, eds[fieldID])
-	if err != nil {
-		return ""
-	}
-
-	str, ok := ext.(*string)
-	if !ok {
-		return ""
-	}
-
-	return *str
-}
-
 func boolMethodOptionsExtension(fieldID int32, f *descriptor.MethodDescriptorProto) bool {
 	if f == nil {
 		return false
@@ -545,7 +393,7 @@ func boolMethodOptionsExtension(fieldID int32, f *descriptor.MethodDescriptorPro
 			ExtendedType:  extendedType,
 			ExtensionType: extensionType,
 			Field:         fieldID,
-			Tag:           fmt.Sprintf("varint,%d", fieldID),
+			Tag:           fmt.Sprintf("bytes,%d", fieldID),
 		}
 		proto.RegisterExtension(ed)
 		eds = proto.RegisteredExtensions(f.Options)
@@ -599,41 +447,6 @@ func boolFieldExtension(fieldID int32, f *descriptor.FieldDescriptorProto) bool
 	return *b
 }
 
-func boolMessageExtension(fieldID int32, f *descriptor.DescriptorProto) bool {
-	if f == nil {
-		return false
-	}
-	if f.Options == nil {
-		return false
-	}
-	var extendedType *descriptor.MessageOptions
-	var extensionType *bool
-
-	eds := proto.RegisteredExtensions(f.Options)
-	if eds[fieldID] == nil {
-		ed := &proto.ExtensionDesc{
-			ExtendedType:  extendedType,
-			ExtensionType: extensionType,
-			Field:         fieldID,
-			Tag:           fmt.Sprintf("varint,%d", fieldID),
-		}
-		proto.RegisterExtension(ed)
-		eds = proto.RegisteredExtensions(f.Options)
-	}
-
-	ext, err := proto.GetExtension(f.Options, eds[fieldID])
-	if err != nil {
-		return false
-	}
-
-	b, ok := ext.(*bool)
-	if !ok {
-		return false
-	}
-
-	return *b
-}
-
 func init() {
 	for k, v := range sprig.TxtFuncMap() {
 		ProtoHelpersFuncMap[k] = v
@@ -1315,13 +1128,3 @@ func replaceDict(src string, dict map[string]interface{}) string {
 	}
 	return src
 }
-
-func goPkg(f *descriptor.FileDescriptorProto) string {
-	return f.Options.GetGoPackage()
-}
-
-func goPkgLastElement(f *descriptor.FileDescriptorProto) string {
-	pkg := goPkg(f)
-	pkgSplitted := strings.Split(pkg, "/")
-	return pkgSplitted[len(pkgSplitted)-1]
-}

main.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/protoc-gen-go/generator"
-	plugin_go "github.com/golang/protobuf/protoc-gen-go/plugin"
+	"github.com/golang/protobuf/protoc-gen-go/plugin"
 	ggdescriptor "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor"
 
 	pgghelpers "moul.io/protoc-gen-gotemplate/helpers"
@@ -48,7 +48,6 @@ func main() {
 		debug             = false
 		all               = false
 		singlePackageMode = false
-		fileMode          = false
 	)
 	if parameter := g.Request.GetParameter(); parameter != "" {
 		for _, param := range strings.Split(parameter, ",") {
@@ -86,14 +85,6 @@ func main() {
 				default:
 					log.Printf("Err: invalid value for debug: %q", parts[1])
 				}
-			case "file-mode":
-				switch strings.ToLower(parts[1]) {
-				case boolTrue, "t":
-					fileMode = true
-				case boolFalse, "f":
-				default:
-					log.Printf("Err: invalid value for file-mode: %q", parts[1])
-				}
 			default:
 				log.Printf("Err: unknown parameter: %q", param)
 			}
@@ -134,17 +125,6 @@ func main() {
 			continue
 		}
 
-		if fileMode {
-			if s := file.GetService(); s != nil && len(s) > 0 {
-				encoder := NewGenericTemplateBasedEncoder(templateDir, file, debug, destinationDir)
-				for _, tmpl := range encoder.Files() {
-					concatOrAppend(tmpl)
-				}
-			}
-
-			continue
-		}
-
 		for _, service := range file.GetService() {
 			encoder := NewGenericServiceTemplateBasedEncoder(templateDir, service, file, debug, destinationDir)
 			for _, tmpl := range encoder.Files() {

renovate.json

@@ -1,6 +1,5 @@
 {
   "extends": [
     "config:base"
-  ],
+  ]
-  "groupName": "all"
 }