bingyi/vscode-extension-samples
1
0
Fork 0
mirror of https://github.com/microsoft/vscode-extension-samples.git synced 2026-06-13 07:10:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Pine Wu
2018-10-30 13:01:37 -07:00
parent 0b26279212
commit ddf6bc3826
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tree-view-sample/src/testView.ts
View File

@ -63,17 +63,10 @@ function getChildren(key: string): string[] {
return [];
}
<<<<<<< HEAD
function getTreeItem(key: string): vscode.TreeItem2 {
const treeElement = getTreeElement(key);
return {
label: <vscode.TreeItemLabel>{ label: key, highlights: key.length > 1 ? [[key.length - 2, key.length - 1]] : void 0},
=======
function getTreeItem(key: string): vscode.TreeItem {
const treeElement = getTreeElement(key);
return {
label: key,
>>>>>>> ext-docs
tooltip: `Tooltip for ${key}`,
collapsibleState: treeElement && Object.keys(treeElement).length ? vscode.TreeItemCollapsibleState.Collapsed : vscode.TreeItemCollapsibleState.None
};