From 27194aac2967b3d256a434861270573e60b80046 Mon Sep 17 00:00:00 2001 From: yoheimuta Date: Wed, 12 Jun 2019 21:36:37 +0900 Subject: [PATCH] chore: Bump go-protoparser and fix trivial incompat issues --- go.mod | 2 +- go.sum | 2 ++ internal/addon/rules/internal/visitor/baseVisitor.go | 3 +++ .../rules/internal/visitor/extendedDisableRuleVisitor.go | 6 ++++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b9811c81..3b4091d9 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/yoheimuta/protolint require ( github.com/kr/pretty v0.1.0 // indirect github.com/kr/pty v1.1.5 // indirect - github.com/yoheimuta/go-protoparser v1.3.0 + github.com/yoheimuta/go-protoparser v2.0.0+incompatible gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v2 v2.2.2 ) diff --git a/go.sum b/go.sum index 108a5f24..621d2d75 100644 --- a/go.sum +++ b/go.sum @@ -8,6 +8,8 @@ github.com/yoheimuta/go-protoparser v1.2.0 h1:QUc8Y0L6ucTqw5Cm1EH4GFbXqcM6MutSr1 github.com/yoheimuta/go-protoparser v1.2.0/go.mod h1:NMMDARGayMyLM9oD1JUgKyF1Tv7aj9S+KcTG4lqvemo= github.com/yoheimuta/go-protoparser v1.3.0 h1:rHDOtpGuaFUFmT1qIlg/RrUjBB8GabEGA97siSEAD7E= github.com/yoheimuta/go-protoparser v1.3.0/go.mod h1:NMMDARGayMyLM9oD1JUgKyF1Tv7aj9S+KcTG4lqvemo= +github.com/yoheimuta/go-protoparser v2.0.0+incompatible h1:HVstTyDcki8G0F7CMm7ktPP22v7Y/WyLG4VV+fuxCJE= +github.com/yoheimuta/go-protoparser v2.0.0+incompatible/go.mod h1:NMMDARGayMyLM9oD1JUgKyF1Tv7aj9S+KcTG4lqvemo= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/addon/rules/internal/visitor/baseVisitor.go b/internal/addon/rules/internal/visitor/baseVisitor.go index 773c7ed9..639921a5 100644 --- a/internal/addon/rules/internal/visitor/baseVisitor.go +++ b/internal/addon/rules/internal/visitor/baseVisitor.go @@ -25,6 +25,9 @@ func (BaseVisitor) VisitEnum(*parser.Enum) (next bool) { return true } // VisitEnumField works noop. func (BaseVisitor) VisitEnumField(*parser.EnumField) (next bool) { return true } +// VisitExtend works noop. +func (BaseVisitor) VisitExtend(*parser.Extend) (next bool) { return true } + // VisitField works noop. func (BaseVisitor) VisitField(*parser.Field) (next bool) { return true } diff --git a/internal/addon/rules/internal/visitor/extendedDisableRuleVisitor.go b/internal/addon/rules/internal/visitor/extendedDisableRuleVisitor.go index c4b6bc63..b760776e 100644 --- a/internal/addon/rules/internal/visitor/extendedDisableRuleVisitor.go +++ b/internal/addon/rules/internal/visitor/extendedDisableRuleVisitor.go @@ -48,6 +48,12 @@ func (v extendedDisableRuleVisitor) VisitEnumField(e *parser.EnumField) (next bo } return v.inner.VisitEnumField(e) } +func (v extendedDisableRuleVisitor) VisitExtend(m *parser.Extend) (next bool) { + if v.interpreter.Interpret(m.Comments, m.InlineComment, m.InlineCommentBehindLeftCurly) { + return true + } + return v.inner.VisitExtend(m) +} func (v extendedDisableRuleVisitor) VisitField(f *parser.Field) (next bool) { if v.interpreter.Interpret(f.Comments, f.InlineComment) { return true