Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

loose up a bit on what happens when build error report on us errors o… #12059

Merged
merged 1 commit into from
Jun 17, 2016
Merged

loose up a bit on what happens when build error report on us errors o… #12059

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions src/VisualStudio/Core/Def/Implementation/TaskList/ExternalErrorDiagnosticUpdateSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,11 +561,11 @@ public bool Equals(DiagnosticData item1, DiagnosticData item2)
return false;
}

var lineColumn1 = GetOriginalOrMappedLineColumn(item1);
var lineColumn2 = GetOriginalOrMappedLineColumn(item2);

if (item1.DocumentId != null && item2.DocumentId != null)
{
var lineColumn1 = GetOriginalOrMappedLineColumn(item1);
var lineColumn2 = GetOriginalOrMappedLineColumn(item2);

return item1.Id == item2.Id &&
item1.Message == item2.Message &&
item1.ProjectId == item2.ProjectId &&
Expand All @@ -578,15 +578,18 @@ public bool Equals(DiagnosticData item1, DiagnosticData item2)
return item1.Id == item2.Id &&
item1.Message == item2.Message &&
item1.ProjectId == item2.ProjectId &&
item1.DataLocation?.OriginalFilePath == item2.DataLocation?.OriginalFilePath &&
lineColumn1.Item1 == lineColumn2.Item1 &&
lineColumn1.Item2 == lineColumn2.Item2 &&
item1.Severity == item2.Severity;
}

public int GetHashCode(DiagnosticData obj)
{
var lineColumn = GetOriginalOrMappedLineColumn(obj);

if (obj.DocumentId != null)
{
var lineColumn = GetOriginalOrMappedLineColumn(obj);

return Hash.Combine(obj.Id,
Hash.Combine(obj.Message,
Hash.Combine(obj.ProjectId,
Expand All @@ -597,7 +600,10 @@ public int GetHashCode(DiagnosticData obj)

return Hash.Combine(obj.Id,
Hash.Combine(obj.Message,
Hash.Combine(obj.ProjectId, (int)obj.Severity)));
Hash.Combine(obj.ProjectId,
Hash.Combine(obj.DataLocation?.OriginalFilePath?.GetHashCode() ?? 0,
Hash.Combine(lineColumn.Item1,
Hash.Combine(lineColumn.Item2, (int)obj.Severity))))));
}

private static ValueTuple<int, int> GetOriginalOrMappedLineColumn(DiagnosticData data)
Expand All @@ -608,6 +614,11 @@ private static ValueTuple<int, int> GetOriginalOrMappedLineColumn(DiagnosticData
return ValueTuple.Create(data.DataLocation?.MappedStartLine ?? 0, data.DataLocation?.MappedStartColumn ?? 0);
}

if (data.DocumentId == null)
{
return ValueTuple.Create(data.DataLocation?.MappedStartLine ?? 0, data.DataLocation?.MappedStartColumn ?? 0);
}

var containedDocument = workspace.GetHostDocument(data.DocumentId) as ContainedDocument;
if (containedDocument == null)
{
Expand Down