Skip to content

Commit bf754a8

Browse files
committed
Reordered solc & solium definitions
This is just a reordering, no content-change, separated out to make upcoming commits more readable
1 parent fbdbb67 commit bf754a8

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

solidity-flycheck.el

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,23 +84,6 @@ we pass the directory to solium via the `--config' option."
8484
:safe #'stringp
8585
:package-version '(solidity-mode . "0.1.4"))
8686

87-
;; add a solidity mode callback to set the executable of solc for flycheck
88-
;; define solidity's flycheck syntax checker
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)
103-
10487
;; define solium flycheck syntax checker
10588
(flycheck-define-checker solium-checker
10689
"A Solidity linter using solium"
@@ -130,6 +113,23 @@ we pass the directory to solium via the `--config' option."
130113
(setq flycheck-solium-checker-executable solidity-solium-path))
131114
(error (format "Solidity Mode Configuration error. Requested solium flycheck integration but can't find solium at: %s" solidity-solium-path))))
132115

116+
;; add a solidity mode callback to set the executable of solc for flycheck
117+
;; define solidity's flycheck syntax checker
118+
;; expanded the flycheck-define-checker macro in order to eval certain args, as per advice given in gitter
119+
;; https://gitter.im/flycheck/flycheck?at=5a43b3a8232e79134d98872b
120+
(flycheck-def-executable-var solidity-checker "solc")
121+
(flycheck-define-command-checker 'solidity-checker
122+
"A Solidity syntax checker using the solc compiler"
123+
:command '("solc" source-inplace)
124+
:error-patterns '((error line-start (file-name) ":" line ":" column ":" " Error: " (message))
125+
(error line-start "Error: " (message))
126+
(warning line-start (file-name) ":" line ":" column ":" " Warning: " (message)))
127+
:modes 'solidity-mode
128+
:predicate #'(lambda nil (eq major-mode 'solidity-mode))
129+
:next-checkers `((,solidity-flycheck-chaining-error-level . solium-checker))
130+
:standard-input 'nil
131+
:working-directory 'nil)
132+
133133
(when solidity-flycheck-solc-checker-active
134134
(if (funcall flycheck-executable-find solidity-solc-path)
135135
(progn

0 commit comments

Comments
 (0)