Upgrade to PG* 0.4.3 (#109)

* Upgrade to PG* 0.4.3 * checkpoint * checkpoint
bufbuild · Oct 26, 2018 · 2a7aa7d · 2a7aa7d
1 parent 379ff5f
commit 2a7aa7d
Show file tree

Hide file tree

Showing 40 changed files with 10,256 additions and 9,624 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -4,7 +4,7 @@
 
 [[constraint]]
  name = "github.com/lyft/protoc-gen-star"
- version = "0.4.2"
+ version = "0.4.3"
 
 [[constraint]]
  branch = "master"

diff --git a/Makefile b/Makefile
@@ -52,7 +52,7 @@ vendor:
 .PHONY: lint
 lint:
  # lints the package for common code smells
- which golint || go get -u github.com/golang/lint/golint
+ which golint || go get -u golang.org/x/lint/golint
  test -z "$(gofmt -d -s ./*.go)" || (gofmt -d -s ./*.go && exit 1)
  # golint -set_exit_status
  go tool vet -all -shadow -shadowstrict *.go

diff --git a/templates/cc/register.go b/templates/cc/register.go
@@ -137,8 +137,15 @@ func (fns CCFuncs) hasAccessor(ctx shared.RuleContext) string {
  fns.methodName(ctx.Field.Name()))
 }
 
+func (fns CCFuncs) classBaseName(msg pgs.Message) string {
+ if m, ok := msg.Parent().(pgs.Message); ok {
+ return fmt.Sprintf("%s_%s", fns.classBaseName(m), msg.Name().String())
+ }
+ return msg.Name().String()
+}
+
 func (fns CCFuncs) className(msg pgs.Message) string {
- return fns.packageName(msg) + "::" + fns.Name(msg).String()
+ return fns.packageName(msg) + "::" + fns.classBaseName(msg)
 }
 
 func (fns CCFuncs) packageName(msg pgs.Message) string {

diff --git a/tests/harness/cases/messages.proto b/tests/harness/cases/messages.proto
@@ -26,3 +26,5 @@ message Message { TestMsg val = 1; }
 message MessageCrossPackage { tests.harness.cases.other_package.Embed val = 1; }
 message MessageSkip { TestMsg val = 1 [(validate.rules).message.skip = true];}
 message MessageRequired { TestMsg val = 1 [(validate.rules).message.required = true]; }
+
+message MessageWith3dInside {}
diff --git a/vendor/github.com/gogo/protobuf/proto/properties.go b/vendor/github.com/gogo/protobuf/proto/properties.go
diff --git a/vendor/github.com/lyft/protoc-gen-star/.travis.yml b/vendor/github.com/lyft/protoc-gen-star/.travis.yml
diff --git a/vendor/github.com/lyft/protoc-gen-star/README.md b/vendor/github.com/lyft/protoc-gen-star/README.md
diff --git a/vendor/github.com/lyft/protoc-gen-star/artifact.go b/vendor/github.com/lyft/protoc-gen-star/artifact.go
diff --git a/vendor/github.com/lyft/protoc-gen-star/lang/go/name.go b/vendor/github.com/lyft/protoc-gen-star/lang/go/name.go
diff --git a/vendor/github.com/lyft/protoc-gen-star/lang/go/name_test.go b/vendor/github.com/lyft/protoc-gen-star/lang/go/name_test.go
diff --git a/vendor/github.com/lyft/protoc-gen-star/lang/go/testdata/names/entities/entities.proto b/vendor/github.com/lyft/protoc-gen-star/lang/go/testdata/names/entities/entities.proto
diff --git a/...m/lyft/protoc-gen-star/lang/go/testdata/names/import_path_mapped/import_path_mapped.proto b/...m/lyft/protoc-gen-star/lang/go/testdata/names/import_path_mapped/import_path_mapped.proto
diff --git a/vendor/github.com/lyft/protoc-gen-star/lang/go/testdata/names/import_path_mapped/params b/vendor/github.com/lyft/protoc-gen-star/lang/go/testdata/names/import_path_mapped/params
diff --git a/vendor/github.com/lyft/protoc-gen-star/module.go b/vendor/github.com/lyft/protoc-gen-star/module.go
diff --git a/vendor/github.com/lyft/protoc-gen-star/module_test.go b/vendor/github.com/lyft/protoc-gen-star/module_test.go
diff --git a/vendor/github.com/lyft/protoc-gen-star/persister.go b/vendor/github.com/lyft/protoc-gen-star/persister.go
diff --git a/vendor/github.com/lyft/protoc-gen-star/persister_test.go b/vendor/github.com/lyft/protoc-gen-star/persister_test.go
diff --git a/vendor/golang.org/x/net/bpf/constants.go b/vendor/golang.org/x/net/bpf/constants.go