From 7427fbdfa39e772ad34c7db5af595c7c1b80f4b5 Mon Sep 17 00:00:00 2001 From: Johan Brandhorst Date: Thu, 13 Jun 2019 09:06:42 +0100 Subject: [PATCH] Revert "protoc-gen-swagger: check typeIndex when typeName is Method" This reverts commit 8140d9885335da81d10ae02cff62afff36fb4ae4. It caused a regression in the swagger generator allow_merge behaviour. Fixes #923 --- protoc-gen-swagger/genswagger/template.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protoc-gen-swagger/genswagger/template.go b/protoc-gen-swagger/genswagger/template.go index b802fef186d..b02ed6aa2c7 100644 --- a/protoc-gen-swagger/genswagger/template.go +++ b/protoc-gen-swagger/genswagger/template.go @@ -1366,7 +1366,7 @@ func isProtoPathMatches(paths []int32, outerPaths []int32, typeName string, type } if typeName == "Method" { - if paths[0] != serviceProtoPath || paths[1] != typeIndex || paths[2] != methodProtoPath { + if paths[0] != serviceProtoPath || paths[2] != methodProtoPath { return false } paths = paths[2:]