Avoid null reference exceptions in diagnostics parsing (#149)

* Avoid a couple possible null reference exceptions

* Switch syntax around a little bit.
This commit is contained in:
Karl Burtram
2016-11-17 15:06:57 -08:00
committed by GitHub
parent c2ffd4c2a5
commit a54d081363

View File

@@ -877,23 +877,26 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
// build a list of SQL script file markers from the errors // build a list of SQL script file markers from the errors
List<ScriptFileMarker> markers = new List<ScriptFileMarker>(); List<ScriptFileMarker> markers = new List<ScriptFileMarker>();
foreach (var error in parseResult.Errors) if (parseResult != null && parseResult.Errors != null)
{ {
markers.Add(new ScriptFileMarker() foreach (var error in parseResult.Errors)
{ {
Message = error.Message, markers.Add(new ScriptFileMarker()
Level = ScriptFileMarkerLevel.Error,
ScriptRegion = new ScriptRegion()
{ {
File = scriptFile.FilePath, Message = error.Message,
StartLineNumber = error.Start.LineNumber, Level = ScriptFileMarkerLevel.Error,
StartColumnNumber = error.Start.ColumnNumber, ScriptRegion = new ScriptRegion()
StartOffset = 0, {
EndLineNumber = error.End.LineNumber, File = scriptFile.FilePath,
EndColumnNumber = error.End.ColumnNumber, StartLineNumber = error.Start.LineNumber,
EndOffset = 0 StartColumnNumber = error.Start.ColumnNumber,
} StartOffset = 0,
}); EndLineNumber = error.End.LineNumber,
EndColumnNumber = error.End.ColumnNumber,
EndOffset = 0
}
});
}
} }
return markers.ToArray(); return markers.ToArray();