ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash handling messages when selection is null (#614)

Browse Source
This commit is contained in:
Matt Irvine
2018-05-02 16:26:49 -07:00
committed by GitHub
parent 5baa3bc18a
commit c4356345f7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs
View File

@@ -602,7 +602,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
if (string.IsNullOrEmpty(procedure)) if (string.IsNullOrEmpty(procedure))
{ {
detailedMessage = string.Format("Msg {0}, Level {1}, State {2}, Line {3}{4}{5}", detailedMessage = string.Format("Msg {0}, Level {1}, State {2}, Line {3}{4}{5}",
errorNumber, errorClass, state, lineNumber + Selection.StartLine, errorNumber, errorClass, state, lineNumber + (Selection != null ? Selection.StartLine : 0),
Environment.NewLine, message); Environment.NewLine, message);
} }
else else
@@ -670,7 +670,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
// Not a user cancellation error, add all // Not a user cancellation error, add all
foreach (var error in errors) foreach (var error in errors)
{ {
int lineNumber = error.LineNumber + Selection.StartLine; int lineNumber = error.LineNumber + (Selection != null ? Selection.StartLine : 0);
string message = string.Format("Msg {0}, Level {1}, State {2}, Line {3}{4}{5}", string message = string.Format("Msg {0}, Level {1}, State {2}, Line {3}{4}{5}",
error.Number, error.Class, error.State, lineNumber, error.Number, error.Class, error.State, lineNumber,
Environment.NewLine, error.Message); Environment.NewLine, error.Message);