Simplified exception handling

darrelmiller · darrelmiller · commit f513e139a918 · 2018-06-12T19:38:29.000-04:00
diff --git a/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs
@@ -49,16 +49,6 @@ public OpenApiDocument Read(Stream input, out OpenApiDiagnostic diagnostic)
             {
                 yamlDocument = LoadYamlDocument(input);
             }
-            catch (SemanticErrorException ex)
-            {
-                diagnostic.Errors.Add(new OpenApiError($"#line={ex.Start.Line}", ex.Message));
-                return new OpenApiDocument();
-            }
-            catch (SyntaxErrorException ex)
-            {
-                diagnostic.Errors.Add(new OpenApiError($"#line={ex.Start.Line}", ex.Message));
-                return new OpenApiDocument();
-            }
             catch (YamlException ex)
             {
                 diagnostic.Errors.Add(new OpenApiError($"#char={ex.Start.Line}", ex.Message));
@@ -132,16 +122,6 @@ public T ReadFragment<T>(Stream input, OpenApiSpecVersion version, out OpenApiDi
             {
                 yamlDocument = LoadYamlDocument(input);
             }
-            catch (SyntaxErrorException ex)
-            {
-                diagnostic.Errors.Add(new OpenApiError($"#line={ex.Start.Line}", ex.Message));
-                return default(T);
-            }
-            catch (SemanticErrorException ex)
-            {
-                diagnostic.Errors.Add(new OpenApiError($"#line={ex.Start.Line}", ex.Message));
-                return default(T);
-            }
             catch (YamlException ex)
             {
                 diagnostic.Errors.Add(new OpenApiError($"#line={ex.Start.Line}", ex.Message));

Original file line number	Diff line number	Diff line change
`@@ -49,16 +49,6 @@ public OpenApiDocument Read(Stream input, out OpenApiDiagnostic diagnostic)`
`49`	`49`	`{`
`50`	`50`	`yamlDocument = LoadYamlDocument(input);`
`51`	`51`	`}`
`52`		`- catch (SemanticErrorException ex)`
`53`		`- {`
`54`		`- diagnostic.Errors.Add(new OpenApiError($"#line={ex.Start.Line}", ex.Message));`
`55`		`- return new OpenApiDocument();`
`56`		`- }`
`57`		`- catch (SyntaxErrorException ex)`
`58`		`- {`
`59`		`- diagnostic.Errors.Add(new OpenApiError($"#line={ex.Start.Line}", ex.Message));`
`60`		`- return new OpenApiDocument();`
`61`		`- }`
`62`	`52`	`catch (YamlException ex)`
`63`	`53`	`{`
`64`	`54`	`diagnostic.Errors.Add(new OpenApiError($"#char={ex.Start.Line}", ex.Message));`
`@@ -132,16 +122,6 @@ public T ReadFragment<T>(Stream input, OpenApiSpecVersion version, out OpenApiDi`
`132`	`122`	`{`
`133`	`123`	`yamlDocument = LoadYamlDocument(input);`
`134`	`124`	`}`
`135`		`- catch (SyntaxErrorException ex)`
`136`		`- {`
`137`		`- diagnostic.Errors.Add(new OpenApiError($"#line={ex.Start.Line}", ex.Message));`
`138`		`- return default(T);`
`139`		`- }`
`140`		`- catch (SemanticErrorException ex)`
`141`		`- {`
`142`		`- diagnostic.Errors.Add(new OpenApiError($"#line={ex.Start.Line}", ex.Message));`
`143`		`- return default(T);`
`144`		`- }`
`145`	`125`	`catch (YamlException ex)`
`146`	`126`	`{`
`147`	`127`	`diagnostic.Errors.Add(new OpenApiError($"#line={ex.Start.Line}", ex.Message));`