提交 da636349 编写于 作者: C CyrusNajmabadi

Fix line/column presentation for external items.

上级 52f6acff
......@@ -39,7 +39,10 @@ public VisualStudioDefinitionsAndReferencesFactory(SVsServiceProvider servicePro
return null;
}
var displayParts = GetDisplayParts(filePath, lineNumber, charOffset);
// Add one to the line/column so they are in 1-based coordinates for the UI.
// But keep them 0 based in the ExternalDefinitionLocation so that navigation
// works properly.
var displayParts = GetDisplayParts(filePath, lineNumber + 1, charOffset + 1);
var definitionLocation = new ExternalDefinitionLocation(
_serviceProvider, filePath, lineNumber, charOffset);
......
......@@ -59,11 +59,11 @@ public void PresentDefinitionsAndReferences(DefinitionsAndReferences definitions
// Each definition item may end up as several top nodes (because of partials).
// Add the references to the last item actually in the list.
var definitionTreeItem = i == n - 1
? new DefinitionTreeItem(definitionItem, location, referenceItems)
: new DefinitionTreeItem(definitionItem, location);
var childItems = i == n - 1
? referenceItems
: ImmutableArray<SourceReferenceTreeItem>.Empty;
result.Add(definitionTreeItem);
result.Add(new DefinitionTreeItem(definitionItem, location, childItems));
}
return result.ToImmutable();
......
......@@ -17,17 +17,13 @@ internal class DefinitionTreeItem : AbstractTreeItem
public DefinitionTreeItem(
DefinitionItem definitionItem,
DefinitionLocation definitionLocation,
ImmutableArray<SourceReferenceTreeItem> referenceItems = default(ImmutableArray<SourceReferenceTreeItem>))
ImmutableArray<SourceReferenceTreeItem> referenceItems)
: base(definitionItem.Tags.GetGlyph().GetGlyphIndex())
{
_definitionItem = definitionItem;
_definitionLocation = definitionLocation;
if (!referenceItems.IsDefault)
{
this.Children.AddRange(referenceItems);
}
this.Children.AddRange(referenceItems);
this.DisplayText = CreateDisplayText();
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册