Skip to content

Commit fbdbb67

Browse files
committed
Cleanup pre-expanded macro for solc
* remove the commented original macro, move its comment down * delete the unneeded (progn) * word the explanatory comment more concisely * reformat the expanded macro for readability
1 parent 8af4b14 commit fbdbb67

File tree

1 file changed

+17
-41
lines changed

1 file changed

+17
-41
lines changed

solidity-flycheck.el

Lines changed: 17 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -86,43 +86,20 @@ we pass the directory to solium via the `--config' option."
8686

8787
;; add a solidity mode callback to set the executable of solc for flycheck
8888
;; define solidity's flycheck syntax checker
89-
;; (let ((next-checkers-val `((,solidity-flycheck-chaining-error-level . solium-checker))))
90-
;; (flycheck-define-checker solidity-checker
91-
;; "A Solidity syntax checker using the solc compiler"
92-
;; :command ("solc" source-inplace)
93-
;; :error-patterns
94-
;; ((error line-start (file-name) ":" line ":" column ":" " Error: " (message))
95-
;; (error line-start "Error: " (message))
96-
;; (warning line-start (file-name) ":" line ":" column ":" " Warning: " (message)))
97-
;; :next-checkers next-checkers-val
98-
;; ;; :next-checkers `((,solidity-flycheck-chaining-error-level . solium-checker))
99-
;; :modes solidity-mode
100-
;; :predicate (lambda () (eq major-mode 'solidity-mode))))
101-
102-
;; expanded the flycheck-define-checker macro as per advice given in gitter
103-
;; https://gitter.im/flycheck/flycheck?at=5a43b3a8232e79134d98872b in order to avoid the
104-
;; next-checkers `'` introduced by the flycheck-define-checker macro
105-
(progn
106-
(flycheck-def-executable-var solidity-checker "solc")
107-
(flycheck-define-command-checker 'solidity-checker "A Solidity syntax checker using the solc compiler" :command
108-
'("solc" source-inplace)
109-
:error-patterns
110-
'((error line-start
111-
(file-name)
112-
":" line ":" column ":" " Error: "
113-
(message))
114-
(error line-start "Error: "
115-
(message))
116-
(warning line-start
117-
(file-name)
118-
":" line ":" column ":" " Warning: "
119-
(message)))
120-
:modes 'solidity-mode :predicate
121-
#'(lambda nil
122-
(eq major-mode 'solidity-mode))
123-
:next-checkers
124-
`((,solidity-flycheck-chaining-error-level . solium-checker))
125-
:standard-input 'nil :working-directory 'nil))
89+
;; expanded the flycheck-define-checker macro in order to eval certain args, as per advice given in gitter
90+
;; https://gitter.im/flycheck/flycheck?at=5a43b3a8232e79134d98872b
91+
(flycheck-def-executable-var solidity-checker "solc")
92+
(flycheck-define-command-checker 'solidity-checker
93+
"A Solidity syntax checker using the solc compiler"
94+
:command '("solc" source-inplace)
95+
:error-patterns '((error line-start (file-name) ":" line ":" column ":" " Error: " (message))
96+
(error line-start "Error: " (message))
97+
(warning line-start (file-name) ":" line ":" column ":" " Warning: " (message)))
98+
:modes 'solidity-mode
99+
:predicate #'(lambda nil (eq major-mode 'solidity-mode))
100+
:next-checkers `((,solidity-flycheck-chaining-error-level . solium-checker))
101+
:standard-input 'nil
102+
:working-directory 'nil)
126103

127104
;; define solium flycheck syntax checker
128105
(flycheck-define-checker solium-checker
@@ -131,10 +108,9 @@ we pass the directory to solium via the `--config' option."
131108
(option "--config=" flycheck-solidity-solium-soliumrcfile concat)
132109
"-f"
133110
source-inplace)
134-
:error-patterns
135-
((error line-start (zero-or-more " ") line ":" column (zero-or-more " ") "error" (message))
136-
(error line-start (zero-or-more not-newline) "[Fatal error]" (message))
137-
(warning line-start (zero-or-more " ") line ":" column (zero-or-more " ") "warning" (message)))
111+
:error-patterns ((error line-start (zero-or-more " ") line ":" column (zero-or-more " ") "error" (message))
112+
(error line-start (zero-or-more not-newline) "[Fatal error]" (message))
113+
(warning line-start (zero-or-more " ") line ":" column (zero-or-more " ") "warning" (message)))
138114
:error-filter
139115
;; Add fake line numbers if they are missing in the lint output
140116
(lambda (errors)

0 commit comments

Comments
 (0)