Skip to content

[Code] fix structure #33492

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

Merged
merged 1 commit into from
Mar 20, 2019
Merged

[Code] fix structure #33492

Show file tree
Hide file tree
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
100 changes: 100 additions & 0 deletions ...ugins/code/public/components/symbol_tree/__test__/__snapshots__/symbol_tree.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,106 @@ exports[`render symbol tree correctly 1`] = `
</div>
</div>
</div>
<div
className="euiSideNavItem euiSideNavItem--branch"
>
<div
className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
>
<div
className="sc-bwzfXH jYpsNE"
>
<div
className="euiFlexItem euiFlexItem--flexGrow1"
>
<a
className="code-link"
href="/github.com/elastic/kibana/blob/master/packages/elastic-datemath/src/index.d.ts!L21:0?tab=structure"
onClick={[Function]}
>
<div
className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive code-structure-node"
>
<div
className="euiToken euiToken--tokenTint04 euiToken--circle euiToken--small sc-htpNat hDSXcY"
>
<svg
className="euiIcon euiIcon--medium"
focusable="false"
height="16"
style={null}
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M6.649 4.667l1.326 4.7h.05l1.326-4.7h1.982l-2.134 6.666H6.801L4.667 4.667z"
fillRule="evenodd"
/>
</svg>
</div>
<div
className="euiText euiText--small"
data-test-subj="codeStructureTreeNode-Unit"
>
Unit
</div>
</div>
</a>
</div>
</div>
</div>
</div>
<div
className="euiSideNavItem euiSideNavItem--branch"
>
<div
className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
>
<div
className="sc-bwzfXH jYpsNE"
>
<div
className="euiFlexItem euiFlexItem--flexGrow1"
>
<a
className="code-link"
href="/github.com/elastic/kibana/blob/master/packages/elastic-datemath/src/index.d.ts!L23:14?tab=structure"
onClick={[Function]}
>
<div
className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive code-structure-node"
>
<div
className="euiToken euiToken--tokenTint07 euiToken--circle euiToken--small sc-htpNat hDSXcY"
>
<svg
className="euiIcon euiIcon--medium"
focusable="false"
height="16"
style={null}
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M9.414 3.757l2.829 2.829a2 2 0 0 1 0 2.828l-2.829 2.829a2 2 0 0 1-2.828 0L3.757 9.414a2 2 0 0 1 0-2.828l2.829-2.829a2 2 0 0 1 2.828 0zm-1.747 2.91a1 1 0 0 0-1 1v.666a1 1 0 0 0 1 1h.666a1 1 0 0 0 1-1v-.666a1 1 0 0 0-1-1h-.666z"
fillRule="evenodd"
/>
</svg>
</div>
<div
className="euiText euiText--small"
data-test-subj="codeStructureTreeNode-datemath"
>
datemath
</div>
</div>
</a>
</div>
</div>
</div>
</div>
<div
className="euiSideNavItem euiSideNavItem--branch euiSideNavItem--hasChildItems"
>
Expand Down
20 changes: 20 additions & 0 deletions x-pack/plugins/code/public/components/symbol_tree/__test__/props.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,26 @@ export const props: { structureTree: SymbolWithMembers[] } = {
},
],
},
{
name: 'Unit',
kind: SymbolKind.Variable,
location: {
uri:
'git://github.com/elastic/kibana/blob/master/packages/elastic-datemath/src/index.d.ts',
range: { start: { line: 20, character: 0 }, end: { line: 20, character: 66 } },
},
path: 'Unit',
},
{
name: 'datemath',
kind: SymbolKind.Constant,
location: {
uri:
'git://github.com/elastic/kibana/blob/master/packages/elastic-datemath/src/index.d.ts',
range: { start: { line: 22, character: 14 }, end: { line: 47, character: 1 } },
},
path: 'datemath',
},
],
},
],
Expand Down
7 changes: 5 additions & 2 deletions x-pack/plugins/code/public/reducers/symbol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,11 @@ const generateStructureTree: (symbols: SymbolInformation[]) => any = symbols =>

function findContainer(
tree: SymbolWithMembers[],
containerName: string
containerName?: string
): SymbolInformation | undefined {
if (containerName === undefined) {
return undefined;
}
const regex = new RegExp(`^${containerName}[<(]?.*[>)]?$`);
const result = tree.find((s: SymbolInformation) => {
return regex.test(s.name);
Expand Down Expand Up @@ -93,7 +96,7 @@ const generateStructureTree: (symbols: SymbolInformation[]) => any = symbols =>
(sy: SymbolInformation) => sy.name === SPECIAL_SYMBOL_NAME
);
} else {
container = findContainer(structureTree, s.containerName || '');
container = findContainer(structureTree, s.containerName);
}
if (container) {
if (!container.path) {
Expand Down