From 090a26b28c7686197b602e4590cb80f531982230 Mon Sep 17 00:00:00 2001 From: "Peter P. Gengler" Date: Sat, 7 Mar 2020 17:06:48 -0700 Subject: [PATCH 1/2] Add DescribeTable and Entry to syntax highlighting --- syntax/ginkgo.vim | 14 +++++++------- syntax/ginkgo.vim.tpl | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/syntax/ginkgo.vim b/syntax/ginkgo.vim index 4eb10da..79bd8f0 100644 --- a/syntax/ginkgo.vim +++ b/syntax/ginkgo.vim @@ -1,4 +1,4 @@ -" This file was generated by gensyntax.go on Sun, 03 Dec 2017 01:11:23 +0000 +" This file was generated by gensyntax.go on Sun, 08 Mar 2020 00:09:42 +0000 " DO NOT modify this file by hand! " Instead, edit ginkgo.vim.tpl and/or run: go generate @@ -14,24 +14,24 @@ unlet! b:current_syntax syntax keyword ginkgoCallbacks AfterEach AfterSuite BeforeEach BeforeSuite JustBeforeEach SynchronizedAfterSuite SynchronizedBeforeSuite highlight link ginkgoCallbacks Identifier -syntax keyword ginkgoGroups By Context Describe It Specify +syntax keyword ginkgoGroups By Context Describe DescribeTable Entry It Specify highlight link ginkgoGroups Statement -syntax keyword ginkgoFocusedGroups FContext FDescribe FIt FMeasure FSpecify +syntax keyword ginkgoFocusedGroups FContext FDescribe FDescribeTable FEntry FIt FMeasure FSpecify highlight link ginkgoFocusedGroups Underlined -syntax keyword ginkgoPendingGroups PContext PDescribe PIt PMeasure PSpecify +syntax keyword ginkgoPendingGroups PContext PDescribe PDescribeTable PEntry PIt PMeasure PSpecify highlight link ginkgoPendingGroups Todo -syntax keyword ginkgoDisabledGroups XContext XDescribe XIt XMeasure XSpecify +syntax keyword ginkgoDisabledGroups XContext XDescribe XDescribeTable XEntry XIt XMeasure XSpecify highlight link ginkgoDisabledGroups Comment " Gomega assertions -syntax keyword gomegaAssertions Consistently ConsistentlyWithOffset Eventually EventuallyWithOffset Expect ExpectWithOffset Ω +syntax keyword gomegaAssertions highlight link gomegaAssertions Constant " Gomega matchers -syntax keyword gomegaMatchers And BeADirectory BeARegularFile BeActive BeAnExistingFile BeAssignableToTypeOf BeClosed BeEmpty BeEnabled BeEquivalentTo BeFalse BeFound BeIdenticalTo BeNil BeNumerically BeSelected BeSent BeTemporally BeTrue BeVisible BeZero ConsistOf ContainElement ContainSubstring Equal EqualElement HaveAttribute HaveCSS HaveCap HaveCount HaveKey HaveKeyWithValue HaveLen HaveLoggedError HaveLoggedInfo HaveOccurred HavePopupText HavePrefix HaveSuffix HaveText HaveTitle HaveURL HaveWindowCount Ignore MatchAllElements MatchAllFields MatchElements MatchError MatchFields MatchJSON MatchRegexp MatchText MatchXML MatchYAML Not Or Panic PointTo Receive Reject SatisfyAll SatisfyAny Succeed WithTransform +syntax keyword gomegaMatchers And BeADirectory BeARegularFile BeActive BeAnExistingFile BeAssignableToTypeOf BeClosed BeElementOf BeEmpty BeEnabled BeEquivalentTo BeFalse BeFound BeIdenticalTo BeNil BeNumerically BeSelected BeSent BeTemporally BeTrue BeVisible BeZero ConsistOf ContainElement ContainSubstring Equal EqualElement HaveAttribute HaveCSS HaveCap HaveCount HaveKey HaveKeyWithValue HaveLen HaveLoggedError HaveLoggedInfo HaveOccurred HavePopupText HavePrefix HaveSuffix HaveText HaveTitle HaveURL HaveWindowCount Ignore MatchAllElements MatchAllFields MatchAllKeys MatchElements MatchError MatchFields MatchJSON MatchKeys MatchRegexp MatchText MatchXML MatchYAML Not Or Panic PointTo Receive Reject SatisfyAll SatisfyAny Succeed WithTransform highlight link gomegaMatchers Constant let b:current_syntax = 'ginkgo' diff --git a/syntax/ginkgo.vim.tpl b/syntax/ginkgo.vim.tpl index f8714d4..3fe3bee 100644 --- a/syntax/ginkgo.vim.tpl +++ b/syntax/ginkgo.vim.tpl @@ -15,16 +15,16 @@ unlet! b:current_syntax syntax keyword ginkgoCallbacks AfterEach AfterSuite BeforeEach BeforeSuite JustBeforeEach SynchronizedAfterSuite SynchronizedBeforeSuite highlight link ginkgoCallbacks Identifier -syntax keyword ginkgoGroups By Context Describe It Specify +syntax keyword ginkgoGroups By Context Describe DescribeTable Entry It Specify highlight link ginkgoGroups Statement -syntax keyword ginkgoFocusedGroups FContext FDescribe FIt FMeasure FSpecify +syntax keyword ginkgoFocusedGroups FContext FDescribe FDescribeTable FEntry FIt FMeasure FSpecify highlight link ginkgoFocusedGroups Underlined -syntax keyword ginkgoPendingGroups PContext PDescribe PIt PMeasure PSpecify +syntax keyword ginkgoPendingGroups PContext PDescribe PDescribeTable PEntry PIt PMeasure PSpecify highlight link ginkgoPendingGroups Todo -syntax keyword ginkgoDisabledGroups XContext XDescribe XIt XMeasure XSpecify +syntax keyword ginkgoDisabledGroups XContext XDescribe XDescribeTable XEntry XIt XMeasure XSpecify highlight link ginkgoDisabledGroups Comment " Gomega assertions From 2ec3406805c9ba636820841cbe35f934385a7125 Mon Sep 17 00:00:00 2001 From: "Peter P. Gengler" Date: Sat, 7 Mar 2020 17:17:24 -0700 Subject: [PATCH 2/2] Fix gensyntax.go for updated gomega assertion names Introduced by https://github.com/onsi/gomega/commit/03b046107301b5094b614a4fbc76978e7dd9f7b0 --- gensyntax.go | 2 +- syntax/ginkgo.vim | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gensyntax.go b/gensyntax.go index edfe6b4..df841bb 100644 --- a/gensyntax.go +++ b/gensyntax.go @@ -89,7 +89,7 @@ func (k *Keywords) Search(pkgs []string) (first error) { if res != nil && res.Len() == 1 { if named, ok := res.At(0).Type().(*types.Named); ok { switch named.Obj().Name() { - case "GomegaAssertion", "GomegaAsyncAssertion": + case "Assertion", "AsyncAssertion": k.Assertions = append(k.Assertions, fn.Name()) case "GomegaMatcher": k.Matchers = append(k.Matchers, fn.Name()) diff --git a/syntax/ginkgo.vim b/syntax/ginkgo.vim index 79bd8f0..99d35de 100644 --- a/syntax/ginkgo.vim +++ b/syntax/ginkgo.vim @@ -1,4 +1,4 @@ -" This file was generated by gensyntax.go on Sun, 08 Mar 2020 00:09:42 +0000 +" This file was generated by gensyntax.go on Sun, 08 Mar 2020 00:17:10 +0000 " DO NOT modify this file by hand! " Instead, edit ginkgo.vim.tpl and/or run: go generate @@ -27,11 +27,11 @@ syntax keyword ginkgoDisabledGroups XContext XDescribe XDescribeTable XEntry XIt highlight link ginkgoDisabledGroups Comment " Gomega assertions -syntax keyword gomegaAssertions +syntax keyword gomegaAssertions Consistently ConsistentlyWithOffset Eventually EventuallyWithOffset Expect ExpectWithOffset Ω highlight link gomegaAssertions Constant " Gomega matchers -syntax keyword gomegaMatchers And BeADirectory BeARegularFile BeActive BeAnExistingFile BeAssignableToTypeOf BeClosed BeElementOf BeEmpty BeEnabled BeEquivalentTo BeFalse BeFound BeIdenticalTo BeNil BeNumerically BeSelected BeSent BeTemporally BeTrue BeVisible BeZero ConsistOf ContainElement ContainSubstring Equal EqualElement HaveAttribute HaveCSS HaveCap HaveCount HaveKey HaveKeyWithValue HaveLen HaveLoggedError HaveLoggedInfo HaveOccurred HavePopupText HavePrefix HaveSuffix HaveText HaveTitle HaveURL HaveWindowCount Ignore MatchAllElements MatchAllFields MatchAllKeys MatchElements MatchError MatchFields MatchJSON MatchKeys MatchRegexp MatchText MatchXML MatchYAML Not Or Panic PointTo Receive Reject SatisfyAll SatisfyAny Succeed WithTransform +syntax keyword gomegaMatchers And BeADirectory BeARegularFile BeActive BeAnExistingFile BeAssignableToTypeOf BeClosed BeElementOf BeEmpty BeEnabled BeEquivalentTo BeFalse BeFound BeIdenticalTo BeNil BeNumerically BeSelected BeSent BeTemporally BeTrue BeVisible BeZero ConsistOf ContainElement ContainElements ContainSubstring Equal EqualElement HaveAttribute HaveCSS HaveCap HaveCount HaveHTTPStatus HaveKey HaveKeyWithValue HaveLen HaveLoggedError HaveLoggedInfo HaveOccurred HavePopupText HavePrefix HaveSuffix HaveText HaveTitle HaveURL HaveWindowCount Ignore MatchAllElements MatchAllFields MatchAllKeys MatchElements MatchError MatchFields MatchJSON MatchKeys MatchRegexp MatchText MatchXML MatchYAML Not Or Panic PointTo Receive Reject SatisfyAll SatisfyAny Succeed WithTransform highlight link gomegaMatchers Constant let b:current_syntax = 'ginkgo'