Skip to content

Commit c3e092a

Browse files
committed
Fantomas formatting
1 parent 995197e commit c3e092a

2 files changed

Lines changed: 47 additions & 48 deletions

File tree

src/Oxpecker.ViewEngine/Tools.fs

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,26 +58,25 @@ module CustomWebUtility =
5858
elif '\'' = ch then sb.Append "'"
5959
elif '&' = ch then sb.Append "&"
6060
else sb.Append ch
61-
else
62-
if Char.IsBetween(ch, '\u00A0', '\u00FF') then
63-
// The seemingly arbitrary 160 comes from RFC
64-
sb.Append("&#").Append(int ch).Append(';')
65-
elif Char.IsSurrogate(ch) then
66-
// i is now at the next code unit after 'ch'
67-
if i < input.Length then
68-
match Rune.TryCreate(ch, input[i]) with
69-
| true, rune ->
70-
i <- i + 1
71-
sb.Append("&#").Append(rune.Value).Append(';')
72-
| _ ->
73-
// Don't encode BMP characters (like U+FFFD) since they wouldn't have
74-
// been encoded if explicitly present in the string anyway.
75-
sb.Append(UnicodeReplacementChar)
76-
else
77-
// Invalid surrogate pair
61+
else if Char.IsBetween(ch, '\u00A0', '\u00FF') then
62+
// The seemingly arbitrary 160 comes from RFC
63+
sb.Append("&#").Append(int ch).Append(';')
64+
elif Char.IsSurrogate(ch) then
65+
// i is now at the next code unit after 'ch'
66+
if i < input.Length then
67+
match Rune.TryCreate(ch, input[i]) with
68+
| true, rune ->
69+
i <- i + 1
70+
sb.Append("&#").Append(rune.Value).Append(';')
71+
| _ ->
72+
// Don't encode BMP characters (like U+FFFD) since they wouldn't have
73+
// been encoded if explicitly present in the string anyway.
7874
sb.Append(UnicodeReplacementChar)
7975
else
80-
sb.Append(ch)
76+
// Invalid surrogate pair
77+
sb.Append(UnicodeReplacementChar)
78+
else
79+
sb.Append(ch)
8180
|> ignore
8281

8382
let private htmlAsciiNonEncodingChars =

tests/PerfTest/ViewEngineRender.fs

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -86,33 +86,33 @@ type ViewEngineRender() =
8686
FalcoViewRender.staticHtml |> Falco.Markup.XmlNodeRenderer.renderHtml
8787

8888

89-
// let unencodedFortunes =
90-
// """<!doctype html><html>
91-
// <head><title>Fortunes</title></head>
92-
// <body><table>
93-
// <tr><th>id</th><th>message</th></tr>
94-
// <tr><td>11</td><td><script>alert("This should not be displayed in a browser alert box.");</script></td></tr>
95-
// <tr><td>4</td><td>A bad random number generator: 1, 1, 1, 1, 1, 4.33e+67, 1, 1, 1</td></tr>
96-
// <tr><td>5</td><td>A computer program does what you tell it to do, not what you want it to do.</td></tr>
97-
// <tr><td>2</td><td>`@#$%^&*()_+=-,/|\}{[] ~.</td></tr>
98-
// <tr><td>8</td><td>A list is only as strong as its weakest link. — Donald Knuth</td></tr>
99-
// <tr><td>0</td><td>Съешь ещё этих мягких французских булок, да выпей чаю.</td></tr>
100-
// <tr><td>3</td><td>"Hellö 𝓦orld!"</td></tr>
101-
// <tr><td>7</td><td>😀😄😵‍💫</td></tr>
102-
// <tr><td>10</td><td>联合国中文日</td></tr>
103-
// <tr><td>6</td><td>Emacs is a nice operating system, but I prefer UNIX. — Tom Christaensen</td></tr>
104-
// <tr><td>9</td><td>Feature: A bug with seniority.</td></tr>
105-
// <tr><td>1</td><td>fortune: No such file or directory</td></tr>
106-
// <tr><td>12</td><td>フレームワークのベンチマーク</td></tr>
107-
// </table></body></html>"""
108-
109-
// [<Benchmark>]
110-
// member this.CustomHtmlEncode() =
111-
// let sb = StringBuilder()
112-
// CustomWebUtility.htmlEncode unencodedFortunes sb
113-
//
114-
// [<Benchmark>]
115-
// member this.HtmlEncode() =
116-
// let sb = StringBuilder()
117-
// let s = WebUtility.HtmlEncode unencodedFortunes
118-
// sb.Append(s) |> ignore
89+
// let unencodedFortunes =
90+
// """<!doctype html><html>
91+
// <head><title>Fortunes</title></head>
92+
// <body><table>
93+
// <tr><th>id</th><th>message</th></tr>
94+
// <tr><td>11</td><td><script>alert("This should not be displayed in a browser alert box.");</script></td></tr>
95+
// <tr><td>4</td><td>A bad random number generator: 1, 1, 1, 1, 1, 4.33e+67, 1, 1, 1</td></tr>
96+
// <tr><td>5</td><td>A computer program does what you tell it to do, not what you want it to do.</td></tr>
97+
// <tr><td>2</td><td>`@#$%^&*()_+=-,/|\}{[] ~.</td></tr>
98+
// <tr><td>8</td><td>A list is only as strong as its weakest link. — Donald Knuth</td></tr>
99+
// <tr><td>0</td><td>Съешь ещё этих мягких французских булок, да выпей чаю.</td></tr>
100+
// <tr><td>3</td><td>"Hellö 𝓦orld!"</td></tr>
101+
// <tr><td>7</td><td>😀😄😵‍💫</td></tr>
102+
// <tr><td>10</td><td>联合国中文日</td></tr>
103+
// <tr><td>6</td><td>Emacs is a nice operating system, but I prefer UNIX. — Tom Christaensen</td></tr>
104+
// <tr><td>9</td><td>Feature: A bug with seniority.</td></tr>
105+
// <tr><td>1</td><td>fortune: No such file or directory</td></tr>
106+
// <tr><td>12</td><td>フレームワークのベンチマーク</td></tr>
107+
// </table></body></html>"""
108+
109+
// [<Benchmark>]
110+
// member this.CustomHtmlEncode() =
111+
// let sb = StringBuilder()
112+
// CustomWebUtility.htmlEncode unencodedFortunes sb
113+
//
114+
// [<Benchmark>]
115+
// member this.HtmlEncode() =
116+
// let sb = StringBuilder()
117+
// let s = WebUtility.HtmlEncode unencodedFortunes
118+
// sb.Append(s) |> ignore

0 commit comments

Comments
 (0)