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 6fc3e96..e7ed66b 100644 --- a/syntax/ginkgo.vim +++ b/syntax/ginkgo.vim @@ -1,4 +1,4 @@ -" This file was generated by gensyntax.go on Wed, 31 Mar 2021 19:57:51 +0000 +" This file was generated by gensyntax.go on Tue, 06 Jul 2021 17:48:24 +0000 " DO NOT modify this file by hand! " Instead, edit ginkgo.vim.tpl and/or run: go generate @@ -14,16 +14,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 When +syntax keyword ginkgoGroups By Context Describe DescribeTable Entry It Specify When highlight link ginkgoGroups Statement -syntax keyword ginkgoFocusedGroups FContext FDescribe FIt FMeasure FSpecify FWhen +syntax keyword ginkgoFocusedGroups FContext FDescribe FDescribeTable FEntry FIt FMeasure FSpecify FWhen highlight link ginkgoFocusedGroups Underlined -syntax keyword ginkgoPendingGroups PContext PDescribe PIt PMeasure PSpecify PWhen +syntax keyword ginkgoPendingGroups PContext PDescribe PDescribeTable PEntry PIt PMeasure PSpecify PWhen highlight link ginkgoPendingGroups Todo -syntax keyword ginkgoDisabledGroups XContext XDescribe XIt XMeasure XSpecify XWhen +syntax keyword ginkgoDisabledGroups XContext XDescribe XDescribeTable XEntry XIt XMeasure XSpecify XWhen highlight link ginkgoDisabledGroups Comment " Gomega assertions @@ -31,7 +31,7 @@ syntax keyword gomegaAssertions Consistently ConsistentlyWithOffset Eventually E 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 PanicWith 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 5a750ce..f1376ee 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 When +syntax keyword ginkgoGroups By Context Describe DescribeTable Entry It Specify When highlight link ginkgoGroups Statement -syntax keyword ginkgoFocusedGroups FContext FDescribe FIt FMeasure FSpecify FWhen +syntax keyword ginkgoFocusedGroups FContext FDescribe FDescribeTable FEntry FIt FMeasure FSpecify FWhen highlight link ginkgoFocusedGroups Underlined -syntax keyword ginkgoPendingGroups PContext PDescribe PIt PMeasure PSpecify PWhen +syntax keyword ginkgoPendingGroups PContext PDescribe PDescribeTable PEntry PIt PMeasure PSpecify PWhen highlight link ginkgoPendingGroups Todo -syntax keyword ginkgoDisabledGroups XContext XDescribe XIt XMeasure XSpecify XWhen +syntax keyword ginkgoDisabledGroups XContext XDescribe XDescribeTable XEntry XIt XMeasure XSpecify XWhen highlight link ginkgoDisabledGroups Comment " Gomega assertions