Skip to content

Commit a76f17d

Browse files
baywetbaywet
authored
Merge pull request #1371 from SimonCropp/use-some-raw-strings
use some raw strings
2 parents 170ee50 + e5c2062 commit a76f17d

34 files changed

+2088
-1805
lines changed

‎src/Microsoft.OpenApi.Hidi/OpenApiService.cs‎

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -664,18 +664,21 @@ internal static void WriteTreeDocumentAsHtml(string sourceUrl, OpenApiDocument d
664664
{
665665
var rootNode = OpenApiUrlTreeNode.Create(document, "main");
666666

667-
writer.WriteLine(@"<!doctype html>
668-
<html>
669-
<head>
670-
<meta charset=""utf-8""/>
671-
<script src=""https://cdnjs.cloudflare.com/ajax/libs/mermaid/8.0.0/mermaid.min.js""></script>
672-
</head>
673-
<style>
674-
body {
675-
font-family: Verdana, sans-serif;
676-
}
677-
</style>
678-
<body>");
667+
writer.WriteLine(
668+
"""
669+
<!doctype html>
670+
<html>
671+
<head>
672+
<meta charset="utf-8"/>
673+
<script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/8.0.0/mermaid.min.js"></script>
674+
</head>
675+
<style>
676+
body {
677+
font-family: Verdana, sans-serif;
678+
}
679+
</style>
680+
<body>
681+
""");
679682
writer.WriteLine("<h1>" + document.Info.Title + "</h1>");
680683
writer.WriteLine();
681684
writer.WriteLine($"<h3> API Description: <a href='{sourceUrl}'>{sourceUrl}</a></h3>");
@@ -686,25 +689,29 @@ internal static void WriteTreeDocumentAsHtml(string sourceUrl, OpenApiDocument d
686689
{
687690
writer.WriteLine($"<span style=\"padding:2px;background-color:{style.Value.Color};border: 2px solid\">{style.Key.Replace("_", " ", StringComparison.OrdinalIgnoreCase)}</span>");
688691
}
692+
689693
writer.WriteLine("</div>");
690694
writer.WriteLine("<hr/>");
691695
writer.WriteLine("<code class=\"language-mermaid\">");
692696
rootNode.WriteMermaid(writer);
693697
writer.WriteLine("</code>");
694698

695699
// Write script tag to include JS library for rendering markdown
696-
writer.WriteLine(@"<script>
697-
var config = {
698-
startOnLoad:true,
699-
theme: 'forest',
700-
flowchart:{
701-
useMaxWidth:false,
702-
htmlLabels:true
703-
}
704-
};
705-
mermaid.initialize(config);
706-
window.mermaid.init(undefined, document.querySelectorAll('.language-mermaid'));
707-
</script>");
700+
writer.WriteLine(
701+
"""
702+
<script>
703+
var config = {
704+
startOnLoad:true,
705+
theme: 'forest',
706+
flowchart:{
707+
useMaxWidth:false,
708+
htmlLabels:true
709+
}
710+
};
711+
mermaid.initialize(config);
712+
window.mermaid.init(undefined, document.querySelectorAll('.language-mermaid'));
713+
</script>
714+
""");
708715
// Write script tag to include JS library for rendering mermaid
709716
writer.WriteLine("</html");
710717
}

‎test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ public async Task LoadingDocumentWithResolveAllReferencesShouldLoadDocumentIntoW
2727

2828
// Todo: this should be ReadAsync
2929
var stream = new MemoryStream();
30-
var doc = @"openapi: 3.0.0
31-
info:
32-
title: foo
33-
version: 1.0.0
34-
paths: {}";
30+
var doc = """
31+
openapi: 3.0.0
32+
info:
33+
title: foo
34+
version: 1.0.0
35+
paths: {}
36+
""";
3537
var wr = new StreamWriter(stream);
3638
wr.Write(doc);
3739
wr.Flush();

‎test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@ public class ParseNodeTests
1515
[Fact]
1616
public void BrokenSimpleList()
1717
{
18-
var input = @"swagger: 2.0
19-
info:
20-
title: hey
21-
version: 1.0.0
22-
schemes: [ { ""hello"" }]
23-
paths: { }";
18+
var input =
19+
"""
20+
swagger: 2.0
21+
info:
22+
title: hey
23+
version: 1.0.0
24+
schemes: [ { "hello" }]
25+
paths: { }
26+
""";
2427

2528
var reader = new OpenApiStringReader();
2629
reader.Read(input, out var diagnostic);
@@ -36,20 +39,21 @@ public void BrokenSimpleList()
3639
[Fact]
3740
public void BadSchema()
3841
{
39-
var input = @"openapi: 3.0.0
40-
info:
41-
title: foo
42-
version: bar
43-
paths:
44-
'/foo':
45-
get:
46-
responses:
47-
200:
48-
description: ok
49-
content:
50-
application/json:
51-
schema: asdasd
52-
";
42+
var input = """
43+
openapi: 3.0.0
44+
info:
45+
title: foo
46+
version: bar
47+
paths:
48+
'/foo':
49+
get:
50+
responses:
51+
200:
52+
description: ok
53+
content:
54+
application/json:
55+
schema: asdasd
56+
""";
5357

5458
var reader = new OpenApiStringReader();
5559
reader.Read(input, out var diagnostic);

‎test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyConverterTests.cs‎

Lines changed: 83 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ public class OpenApiAnyConverterTests
2020
[Fact]
2121
public void ParseObjectAsAnyShouldSucceed()
2222
{
23-
var input = @"
24-
aString: fooBar
25-
aInteger: 10
26-
aDouble: 2.34
27-
aDateTime: 2017-01-01
28-
aDate: 2017-01-02
29-
";
23+
var input =
24+
"""
25+
aString: fooBar
26+
aInteger: 10
27+
aDouble: 2.34
28+
aDateTime: 2017-01-01
29+
aDate: 2017-01-02
30+
""";
3031
var yamlStream = new YamlStream();
3132
yamlStream.Load(new StringReader(input));
3233
var yamlNode = yamlStream.Documents.First().RootNode;
@@ -89,30 +90,31 @@ public void ParseObjectAsAnyShouldSucceed()
8990
[Fact]
9091
public void ParseNestedObjectAsAnyShouldSucceed()
9192
{
92-
var input = @"
93-
aString: fooBar
94-
aInteger: 10
95-
aArray:
96-
- 1
97-
- 2
98-
- 3
99-
aNestedArray:
100-
- aFloat: 1
101-
aPassword: 1234
102-
aArray: [abc, def]
103-
aDictionary:
104-
arbitraryProperty: 1
105-
arbitraryProperty2: 2
106-
- aFloat: 1.6
107-
aArray: [123]
108-
aDictionary:
109-
arbitraryProperty: 1
110-
arbitraryProperty3: 20
111-
aObject:
112-
aDate: 2017-02-03
113-
aDouble: 2.34
114-
aDateTime: 2017-01-01
115-
";
93+
var input =
94+
"""
95+
aString: fooBar
96+
aInteger: 10
97+
aArray:
98+
- 1
99+
- 2
100+
- 3
101+
aNestedArray:
102+
- aFloat: 1
103+
aPassword: 1234
104+
aArray: [abc, def]
105+
aDictionary:
106+
arbitraryProperty: 1
107+
arbitraryProperty2: 2
108+
- aFloat: 1.6
109+
aArray: [123]
110+
aDictionary:
111+
arbitraryProperty: 1
112+
arbitraryProperty3: 20
113+
aObject:
114+
aDate: 2017-02-03
115+
aDouble: 2.34
116+
aDateTime: 2017-01-01
117+
""";
116118
var yamlStream = new YamlStream();
117119
yamlStream.Load(new StringReader(input));
118120
var yamlNode = yamlStream.Documents.First().RootNode;
@@ -269,30 +271,31 @@ public void ParseNestedObjectAsAnyShouldSucceed()
269271
[Fact]
270272
public void ParseNestedObjectAsAnyWithPartialSchemaShouldSucceed()
271273
{
272-
var input = @"
273-
aString: fooBar
274-
aInteger: 10
275-
aArray:
276-
- 1
277-
- 2
278-
- 3
279-
aNestedArray:
280-
- aFloat: 1
281-
aPassword: 1234
282-
aArray: [abc, def]
283-
aDictionary:
284-
arbitraryProperty: 1
285-
arbitraryProperty2: 2
286-
- aFloat: 1.6
287-
aArray: [123]
288-
aDictionary:
289-
arbitraryProperty: 1
290-
arbitraryProperty3: 20
291-
aObject:
292-
aDate: 2017-02-03
293-
aDouble: 2.34
294-
aDateTime: 2017-01-01
295-
";
274+
var input =
275+
"""
276+
aString: fooBar
277+
aInteger: 10
278+
aArray:
279+
- 1
280+
- 2
281+
- 3
282+
aNestedArray:
283+
- aFloat: 1
284+
aPassword: 1234
285+
aArray: [abc, def]
286+
aDictionary:
287+
arbitraryProperty: 1
288+
arbitraryProperty2: 2
289+
- aFloat: 1.6
290+
aArray: [123]
291+
aDictionary:
292+
arbitraryProperty: 1
293+
arbitraryProperty3: 20
294+
aObject:
295+
aDate: 2017-02-03
296+
aDouble: 2.34
297+
aDateTime: 2017-01-01
298+
""";
296299
var yamlStream = new YamlStream();
297300
yamlStream.Load(new StringReader(input));
298301
var yamlNode = yamlStream.Documents.First().RootNode;
@@ -424,30 +427,31 @@ public void ParseNestedObjectAsAnyWithPartialSchemaShouldSucceed()
424427
[Fact]
425428
public void ParseNestedObjectAsAnyWithoutUsingSchemaShouldSucceed()
426429
{
427-
var input = @"
428-
aString: fooBar
429-
aInteger: 10
430-
aArray:
431-
- 1
432-
- 2
433-
- 3
434-
aNestedArray:
435-
- aFloat: 1
436-
aPassword: 1234
437-
aArray: [abc, def]
438-
aDictionary:
439-
arbitraryProperty: 1
440-
arbitraryProperty2: 2
441-
- aFloat: 1.6
442-
aArray: [123]
443-
aDictionary:
444-
arbitraryProperty: 1
445-
arbitraryProperty3: 20
446-
aObject:
447-
aDate: 2017-02-03
448-
aDouble: 2.34
449-
aDateTime: 2017-01-01
450-
";
430+
var input =
431+
"""
432+
aString: fooBar
433+
aInteger: 10
434+
aArray:
435+
- 1
436+
- 2
437+
- 3
438+
aNestedArray:
439+
- aFloat: 1
440+
aPassword: 1234
441+
aArray: [abc, def]
442+
aDictionary:
443+
arbitraryProperty: 1
444+
arbitraryProperty2: 2
445+
- aFloat: 1.6
446+
aArray: [123]
447+
aDictionary:
448+
arbitraryProperty: 1
449+
arbitraryProperty3: 20
450+
aObject:
451+
aDate: 2017-02-03
452+
aDouble: 2.34
453+
aDateTime: 2017-01-01
454+
""";
451455
var yamlStream = new YamlStream();
452456
yamlStream.Load(new StringReader(input));
453457
var yamlNode = yamlStream.Documents.First().RootNode;

0 commit comments

Comments
 (0)