020da5bffb
This PR fixes an issue when including a hard line break in a `Format` that caused subsequent (ordinary) line breaks to be erroneously flattened to spaces. This issue is especially important for displaying notes and hints in error messages, as these components could appear garbled due to improper line-break rendering.
105 lines
1.9 KiB
Text
105 lines
1.9 KiB
Text
import Lean.Data.Format
|
|
import Lean.Meta.Basic
|
|
|
|
/-! # Hard line breaks in `Format` text
|
|
|
|
Hard line breaks in `Format`s should not induce inescapable flattening groups, which they did in
|
|
previous versions of Lean.
|
|
-/
|
|
|
|
open Lean Meta
|
|
|
|
/--
|
|
info: A
|
|
B
|
|
C
|
|
-/
|
|
#guard_msgs (whitespace := exact) in
|
|
#eval
|
|
let f : Format := .text "A\nB" ++ .line ++ "C"
|
|
IO.println f.pretty
|
|
|
|
/--
|
|
info: A
|
|
B
|
|
C
|
|
-/
|
|
#guard_msgs (whitespace := exact) in
|
|
run_meta do
|
|
logInfo <| m!"A{indentD "B"}" ++ Format.line ++ "C"
|
|
|
|
/--
|
|
info: A
|
|
B
|
|
C
|
|
D
|
|
-/
|
|
#guard_msgs (whitespace := exact) in
|
|
run_meta do
|
|
let text := toMessageData
|
|
let line := toMessageData Format.line
|
|
logInfo <| text m!"A" ++ line ++ .nest 2 (m!"B" ++ line ++ m!"C") ++ line ++ "D"
|
|
|
|
/--
|
|
info: a
|
|
b
|
|
a b
|
|
-/
|
|
#guard_msgs (whitespace := exact) in
|
|
run_meta do logInfo (m!"a" ++ Format.line ++ m!"b" ++ Format.line ++ .group m!"a\nb")
|
|
|
|
/--
|
|
info: Indented expression:
|
|
Nat
|
|
Bulleted list:
|
|
• A
|
|
• B
|
|
---
|
|
info: Indented expression:
|
|
Nat
|
|
Bulleted list:
|
|
• A
|
|
• B
|
|
---
|
|
info: Bulleted list:
|
|
• A
|
|
• B
|
|
Indented expression:
|
|
Nat
|
|
---
|
|
info: Bulleted list:
|
|
• A
|
|
• B
|
|
Indented expression:
|
|
Nat
|
|
-/
|
|
#guard_msgs (whitespace := exact) in
|
|
run_meta do
|
|
let e := m!"Indented expression:{indentExpr (.const `Nat [])}"
|
|
let l := m!"Bulleted list:{indentD m!"• A\n• B"}"
|
|
logInfo (e ++ .ofFormat (.text "\n") ++ l)
|
|
logInfo (e ++ Format.line ++ l)
|
|
logInfo (l ++ .ofFormat (.text "\n") ++ e)
|
|
logInfo (l ++ Format.line ++ e)
|
|
|
|
-- *Within* flattening groups, flattening should be recomputed after a hard line break:
|
|
/--
|
|
info: A
|
|
A long line
|
|
B
|
|
C
|
|
D
|
|
|
|
A
|
|
A long line
|
|
B C
|
|
D
|
|
-/
|
|
#guard_msgs (whitespace := exact) in
|
|
#eval
|
|
let f : Format := .text "A" ++ .line ++ .group ("A long line" ++ .line ++ .text "B" ++ .line ++ "C") ++ .line ++ "D"
|
|
let f' : Format := .text "A" ++ .line ++ .group ("A long line\nB" ++ .line ++ "C") ++ .line ++ "D"
|
|
do
|
|
IO.println (f.pretty 10)
|
|
IO.println ""
|
|
IO.println (f'.pretty 10)
|