Skip to content

Commit 1323115

Browse files
committed
Fix '--line-numbers none'
1 parent fb19627 commit 1323115

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Grape Changelog
22

3+
## 0.5.1
4+
### CLI
5+
* Fix `--line-numbers none`
6+
37
## 0.5.0 (2020/10/27)
48

59
### Library

src/grape/cli.clj

+3-2
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,11 @@
105105
:no-trailing-newlines? (:no-trailing-newlines options)
106106
:line-numbers (cond
107107
(contains? options :line-numbers)
108-
(keyword (:line-numbers options))
108+
(when (not= "none" (:line-numbers options))
109+
(keyword (:line-numbers options)))
109110

110111
(:no-line-numbers options)
111-
:none
112+
nil
112113

113114
(:all-line-numbers options)
114115
:all

test/grape/cli_test.clj

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
:first ["--line-numbers" "first"]
4646
:all ["--line-numbers" "all"]
4747
;; Aliases
48-
:none ["--line-numbers" "none"]
48+
nil ["--line-numbers" "none"]
4949
:all ["--all-line-numbers"]
5050
:all ["-n"]
51-
:none ["-N"]
51+
nil ["-N"]
5252
;; Mix of aliases
53-
:none ["--all-line-numbers" "--no-line-numbers"]
53+
nil ["--all-line-numbers" "--no-line-numbers"]
5454
;; Mix of --line-numbers with aliases
5555
:first ["--line-numbers" "first" "--all-line-numbers"]
5656
:first ["--line-numbers" "first" "--no-line-numbers"]

0 commit comments

Comments
 (0)