Skip to content

Commit 4a89fc0

Browse files
authored
Merge pull request #115 from clj-commons/hls/fix-cljdoc-tables
Fix tables in docstrings
2 parents 12d2094 + e6d0291 commit 4a89fc0

File tree

6 files changed

+32
-35
lines changed

6 files changed

+32
-35
lines changed

.github/workflows/clojure.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ jobs:
1515

1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v3.5.3
18+
uses: actions/checkout@v4
1919

2020
- name: Setup Java
21-
uses: actions/setup-java@v3.11.0
21+
uses: actions/setup-java@v4.2.1
2222
with:
2323
java-version: '11'
2424
distribution: 'corretto'
2525

2626
- name: Install clojure tools
27-
uses: DeLaGuardo/setup-clojure@11.0
27+
uses: DeLaGuardo/setup-clojure@12.5
2828
with:
29-
cli: 1.11.1.1257
29+
cli: 1.11.2.1446
3030

3131
- name: Cache clojure dependencies
32-
uses: actions/cache@v3
32+
uses: actions/cache@v4
3333
with:
3434
path: |
3535
~/.m2/repository
@@ -43,7 +43,3 @@ jobs:
4343

4444
- name: Run tests (Clojure 1.10)
4545
run: clojure -X:1.10:test
46-
47-
48-
49-

deps.edn

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{:paths ["src"]
2-
:deps {org.clojure/clojure {:mvn/version "1.11.1"}}
2+
:deps {org.clojure/clojure {:mvn/version "1.11.2"}}
33

44
:aliases
55
{:test
66
;; clj -X:test
77
{:extra-paths ["test"]
88
:extra-deps {criterium/criterium {:mvn/version "0.4.6"}
9-
org.clojure/core.async {:mvn/version "1.6.673"}
9+
org.clojure/core.async {:mvn/version "1.6.681"}
1010
io.github.cognitect-labs/test-runner {:git/tag "v0.5.1"
1111
:git/sha "dfb30dd"}}
1212
:jvm-opts ["-Dclj-commons.ansi.enabled=true"]
@@ -15,11 +15,11 @@
1515
;; clj -T:build <command>
1616
:build
1717
{:deps {io.github.hlship/build-tools
18-
{:git/tag "0.10.1" :git/sha "7ecff5b"}}
18+
{:git/tag "0.10.2" :git/sha "3c446e4"}}
1919
:ns-default build}
2020

2121
:1.10
22-
{:override-deps {org.clojure/clojure {:mvn/version "1.10.0"}}}
22+
{:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}}
2323

2424
;; clj -M:test:demo
2525
:demo
@@ -29,7 +29,7 @@
2929
{:jvm-opts ["-Dclj-commons.ansi.enabled=false"]}
3030

3131
:nrepl
32-
{:extra-deps {nrepl/nrepl {:mvn/version "1.0.0"}}
32+
{:extra-deps {nrepl/nrepl {:mvn/version "1.1.1"}}
3333
:main-opts ["-m" "nrepl.cmdline" ]}
3434

3535
:repl

src/clj_commons/ansi.clj

+9-9
Original file line numberDiff line numberDiff line change
@@ -285,14 +285,14 @@
285285
286286
The terms:
287287
288-
| Characteristic | Values |
289-
| -- | -- |
290-
| foreground color | `red` or `bright-red` (for each color) |
291-
| background color | same as foreground color |
292-
| boldness | `bold`, `faint`, or `plain` |
293-
| italics | `italic` or `roman` |
294-
| inverse | `inverse` or `normal` |
295-
| underline | `underlined` or `not-underlined` |
288+
Characteristic | Values
289+
--- |---
290+
foreground color | `red` or `bright-red` (for each color)
291+
background color | same as foreground color
292+
boldness | `bold`, `faint`, or `plain`
293+
italics | `italic` or `roman`
294+
inverse | `inverse` or `normal`
295+
underline | `underlined` or `not-underlined`
296296
297297
e.g.
298298
@@ -324,7 +324,7 @@
324324
The span's font declaration may also be a map with the following keys:
325325
326326
Key | Type | Description
327-
-- |-- |--
327+
--- |--- |---
328328
:font | keyword | The font declaration
329329
:width | number | The visual width of the span
330330
:pad | keyword | Where to pad the span, :left, :right, or :both; default is :left

src/clj_commons/format/binary.clj

+2-1
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@
136136
137137
The full version specifies the [[BinaryData]] to write, and options:
138138
139+
139140
Key | Type | Description
140-
-- |-- |--
141+
--- |--- |---
141142
:ascii | boolean | If true, enable ASCII mode
142143
:line-bytes | number | Bytes printed per line
143144

src/clj_commons/format/exceptions.clj

+9-9
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@
310310
"Extracts the stack trace for an exception and returns a seq of expanded stack frame maps:
311311
312312
Key | Type | Description
313-
-- |-- |--
313+
--- |--- |---
314314
:file | String | Source file name
315315
:line | Integer | Line number as integer, or nil
316316
:class | String | Fully qualified Java class name
@@ -429,12 +429,12 @@
429429
430430
Each exception map contains:
431431
432-
| Key | Type | Description
433-
|-- |-- |--
434-
| :class-name | String | Name of Java class for the exception
435-
| :message | String | Value of the exception's message property (possibly nil)
436-
| :properties | String | Map of properties to (optionally) present in the exception report
437-
| :stack-trace | Vector | Stack trace element maps (as per [[expand-stack-trace]]), or nil; only present in the root exception
432+
Key | Type | Description
433+
--- |--- |---
434+
:class-name | String | Name of Java class for the exception
435+
:message | String | Value of the exception's message property (possibly nil)
436+
:properties | String | Map of properties to (optionally) present in the exception report
437+
:stack-trace | Vector | Stack trace element maps (as per [[expand-stack-trace]]), or nil; only present in the root exception
438438
439439
The :properties map does not include any properties that are assignable to type Throwable.
440440
@@ -618,7 +618,7 @@
618618
The options map may have the following keys:
619619
620620
Key | Description
621-
-- |--
621+
--- |---
622622
:filter | The stack frame filter, which defaults to [[*default-stack-frame-filter*]]
623623
:properties | If true (the default) then properties of exceptions will be output
624624
:frame-limit | If non-nil, the number of stack frames to keep when outputting the stack trace of the deepest exception
@@ -639,7 +639,7 @@
639639
in the stack trace, and must return one of the following values:
640640
641641
Value | Description
642-
-- |--
642+
--- |---
643643
:show | The normal state; display the stack frame
644644
:hide | Prevents the frame from being displayed, as if it never existed
645645
:omit | Replaces the frame with a \"...\" placeholder

src/clj_commons/format/table.clj

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
Alternately, a column can be a map:
103103
104104
Key | Type | Description
105-
-- |-- |--
105+
--- |--- |---
106106
:key | keyword/function | Passed the row data and returns the value for the column (required)
107107
:title | String | The title for the column
108108
:title-pad | :left, :right, :both | How to pad the title column; default is :both to center the title
@@ -129,7 +129,7 @@
129129
opts can be a seq of columns, or it can be a map of options:
130130
131131
Key | Type | Description
132-
-- |-- |--
132+
--- |--- |---
133133
:columns | seq of columns | Describes the columns to print
134134
:style | map | Overrides the default styling of the table
135135
:default-decorator | function | Used when a column doesn't define it own decorator

0 commit comments

Comments
 (0)