From 58abe0533cebf9da1bddd3d39f9319726190568f Mon Sep 17 00:00:00 2001 From: Robert O'Connor Date: Sat, 10 Sep 2016 23:10:40 -0400 Subject: [PATCH] Remove jade checker and replace it with pug checker Jade is now deprecated and is replaced by pug. I do not feel it is worth while to maintain a checker for both. Closes GH-951 --- CHANGES.rst | 2 ++ Cask | 2 +- doc/languages.rst | 12 +++---- flycheck.el | 35 +++++++++++-------- test/flycheck-test.el | 9 ++--- .../resources/language/{jade.jade => pug.pug} | 2 +- 6 files changed, 36 insertions(+), 26 deletions(-) rename test/resources/language/{jade.jade => pug.pug} (71%) diff --git a/CHANGES.rst b/CHANGES.rst index 1aceff067..58f95dd09 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,11 +8,13 @@ own ``.luacheckrc`` detection. Therefore ``flycheck-luacheckrc`` is no longer used [GH-1057] - ``:modes`` is now mandatory for syntax checker definitions [GH-1071] + - Remove Jade checker [GH-951] [GH-1084] - New syntax checkers: - Elixir with ``dogma`` [GH-969] - sass and scss with ``sass-lint`` [GH-1070] + - pug [GH-951] [GH-1084] - New features: diff --git a/Cask b/Cask index 1663ef974..a07d9b14a 100644 --- a/Cask +++ b/Cask @@ -25,7 +25,6 @@ (depends-on "haml-mode") (depends-on "handlebars-mode") (depends-on "haskell-mode") - (depends-on "jade-mode") (depends-on "js2-mode") (depends-on "js3-mode") (depends-on "json-mode") @@ -35,6 +34,7 @@ (depends-on "mmm-mode") (depends-on "php-mode") (depends-on "processing-mode") + (depends-on "pug-mode") (depends-on "puppet-mode") (depends-on "racket-mode") (depends-on "rhtml-mode") diff --git a/doc/languages.rst b/doc/languages.rst index a40258205..922e05f2c 100644 --- a/doc/languages.rst +++ b/doc/languages.rst @@ -538,12 +538,6 @@ to view the docstring of the syntax checker. Likewise, you may use .. syntax-checker-config-file:: flycheck-tidyrc -.. supported-language:: Jade - - .. syntax-checker:: jade - - Check syntax using the `Jade `_ compiler. - .. supported-language:: Javascript Flycheck checks Javascript with one of `javascript-eslint`, @@ -708,6 +702,12 @@ to view the docstring of the syntax checker. Likewise, you may use Check syntax using the `Processing `_ compiler. +.. supported-language:: Pug + + .. syntax-checker:: pug + + Check syntax using the `Pug `_ compiler. + .. supported-language:: Puppet Flycheck checks Puppet with `puppet-parser` and lints with `puppet-lint`. diff --git a/flycheck.el b/flycheck.el index 12028ef85..4cce1a2ba 100644 --- a/flycheck.el +++ b/flycheck.el @@ -197,7 +197,6 @@ attention to case differences." haskell-ghc haskell-hlint html-tidy - jade javascript-eslint javascript-jshint javascript-gjslint @@ -214,6 +213,7 @@ attention to case differences." php-phpmd php-phpcs processing + pug puppet-parser puppet-lint python-flake8 @@ -7372,19 +7372,6 @@ See URL `https://github.com/htacg/tidy-html5'." " - Warning: " (message) line-end)) :modes (html-mode nxhtml-mode)) -(flycheck-define-checker jade - "A Jade syntax checker using the Jade compiler. - -See URL `http://jade-lang.com'." - :command ("jade") - :standard-input t - :error-patterns - ((error line-start - "Error: Jade:" line (zero-or-more not-newline) "\n" - (one-or-more (and (zero-or-more not-newline) "|" - (zero-or-more not-newline) "\n")) - (zero-or-more not-newline) "\n" (message) line-end)) - :modes jade-mode) (flycheck-def-config-file-var flycheck-jshintrc javascript-jshint ".jshintrc" :safe #'stringp) @@ -7777,6 +7764,26 @@ See https://github.com/processing/processing/wiki/Command-Line" ;; This syntax checker needs a file name :predicate (lambda () (buffer-file-name))) +(flycheck-define-checker pug + "A Pug syntax checker using the pug compiler. + +See URL `https://pugjs.org/'." + :command ("pug") + :standard-input t + :error-patterns + ((error line-start + "Error: Pug:" line ":" column (zero-or-more not-newline) "\n" + (one-or-more (or (zero-or-more not-newline) "|" + (zero-or-more not-newline) "\n") + (zero-or-more "-") (zero-or-more not-newline) "|" + (zero-or-more not-newline) "\n") + (zero-or-more not-newline) "\n" + (one-or-more + (zero-or-more not-newline) "|" + (zero-or-more not-newline) "\n") (zero-or-more not-newline) "\n" + (message) line-end)) + :modes pug-mode) + (flycheck-define-checker puppet-parser "A Puppet DSL syntax checker using puppet's own parser. diff --git a/test/flycheck-test.el b/test/flycheck-test.el index 292915d5b..fe92a67c1 100644 --- a/test/flycheck-test.el +++ b/test/flycheck-test.el @@ -3282,10 +3282,6 @@ Why not: '(8 5 warning "discarding unexpected " :checker html-tidy))) -(flycheck-ert-def-checker-test jade jade nil - (flycheck-ert-should-syntax-check - "language/jade.jade" 'jade-mode - '(2 nil error "unexpected token \"indent\"" :checker jade))) (defconst flycheck-test-javascript-modes '(js-mode js2-mode @@ -3542,6 +3538,11 @@ Why not: '(26 12 error "TRUE, FALSE and NULL must be lowercase; expected \"false\" but found \"FALSE\"" :id "Generic.PHP.LowerCaseConstant.Found" :checker php-phpcs))) +(flycheck-ert-def-checker-test pug pug nil + (flycheck-ert-should-syntax-check + "language/pug.pug" 'pug-mode + '(2 1 error "unexpected token \"indent\"" :checker pug))) + (flycheck-ert-def-checker-test processing processing syntax-error (flycheck-ert-should-syntax-check "language/processing/syntax_error/syntax_error.pde" 'processing-mode diff --git a/test/resources/language/jade.jade b/test/resources/language/pug.pug similarity index 71% rename from test/resources/language/jade.jade rename to test/resources/language/pug.pug index d3de832dc..ba22fe7b2 100644 --- a/test/resources/language/jade.jade +++ b/test/resources/language/pug.pug @@ -1,6 +1,6 @@ doctype html html head - title Jade Examples + title Pug Examples body h1 Markup example