refactor(parser): remove unused grammar rule (#753)

also, use same check rules for Golang CI on CLI vs on GitHub Actions. Signed-off-by: Xavier Coulon <[email protected]>
bytesparadise · Sep 6, 2020 · 7a90b4e · 7a90b4e
1 parent 4fd36b5
commit 7a90b4e
Show file tree

Hide file tree

Showing 5 changed files with 536 additions and 604 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -10,6 +10,9 @@ linters:
     - govet
     - gocyclo
     - unused
+    - gofmt
+    - golint
+    - misspell
   enable-all: false
   disable:
     - maligned

diff --git a/pkg/parser/document_processing_apply_substitutions.go b/pkg/parser/document_processing_apply_substitutions.go
@@ -463,9 +463,8 @@ var (
 	substituteAttributesFunc        = elementsSubstitutionWithPlaceholders("AttributesSubstitution") // TODO: include with applyAttributeSubstitutionsOnElementsFunc?
 	substituteReplacementsFunc      = elementsSubstitutionWithPlaceholders("ReplacementsSubstitution")
 	substituteInlineMacrosFunc      = elementsSubstitutionWithPlaceholders("InlineMacrosSubstitution") // elementsSubstitution("InlineMacrosSubstitution")
-	// substituteQuotedTextAndInlineMacrosFunc = elementsSubstitution("QuotedTextAndInlineMacrosSubstitution")
-	substitutePostReplacementsFunc = elementsSubstitutionWithPlaceholders("PostReplacementsSubstitution")
-	substituteNothingFunc          = elementsSubstitution("NoneSubstitution")
+	substitutePostReplacementsFunc  = elementsSubstitutionWithPlaceholders("PostReplacementsSubstitution")
+	substituteNothingFunc           = elementsSubstitution("NoneSubstitution")
 )
 
 func elementsSubstitution(ruleName string) elementsSubstitutionFunc {

diff --git a/pkg/parser/generate.go b/pkg/parser/generate.go
@@ -1,3 +1,3 @@
 package parser
 
-//go:generate pigeon -optimize-parser -alternate-entrypoints AsciidocRawDocument,RawFile,TextDocument,DocumentRawBlock,FileLocation,IncludedFileLine,InlineLinks,LabeledListItemTerm,NormalBlockContentSubstitution,VerseBlockContentSubstitution,MarkdownQuoteBlockAttribution,InlineElements,QuotedTextSubstitution,NoneSubstitution,AttributesSubstitution,ReplacementsSubstitution,PostReplacementsSubstitution,QuotedTextAndInlineMacrosSubstitution,InlinePassthroughSubstitution -o parser.go parser.peg
+//go:generate pigeon -optimize-parser -alternate-entrypoints AsciidocRawDocument,RawFile,TextDocument,DocumentRawBlock,FileLocation,IncludedFileLine,InlineLinks,LabeledListItemTerm,NormalBlockContentSubstitution,VerseBlockContentSubstitution,MarkdownQuoteBlockAttribution,InlineElements,QuotedTextSubstitution,NoneSubstitution,AttributesSubstitution,ReplacementsSubstitution,PostReplacementsSubstitution,InlinePassthroughSubstitution -o parser.go parser.peg