Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 3 additions & 17 deletions x-pack/plugins/code/public/components/codeblock/codeblock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,16 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { EuiPanel, EuiText } from '@elastic/eui';
import { EuiSpacer } from '@elastic/eui';
import theme from '@elastic/eui/dist/eui_theme_light.json';
import { EuiPanel } from '@elastic/eui';
import { editor, IPosition, IRange } from 'monaco-editor';
import React from 'react';
import styled from 'styled-components';
import { ResizeChecker } from 'ui/resize_checker';
import { monaco } from '../../monaco/monaco';
import { registerEditor } from '../../monaco/single_selection_helper';

const U = styled.u`
color: ${theme.euiCodeBlockTagColor};
`;

interface Props {
code: string;
file?: string;
fileComponent?: React.ReactNode;
startLine?: number;
language?: string;
highlightRanges?: IRange[];
Expand Down Expand Up @@ -130,14 +123,7 @@ export class CodeBlock extends React.PureComponent<Props> {
const linesCount = this.props.code.split('\n').length;
return (
<EuiPanel style={{ marginBottom: '2rem' }} paddingSize="s">
{this.props.file && (
<React.Fragment>
<EuiText>
<U>{this.props.file}</U>
</EuiText>
<EuiSpacer size="s" />
</React.Fragment>
)}
{this.props.fileComponent}
<div ref={r => (this.el = r)} style={{ height: linesCount * 18 }} />
</EuiPanel>
);
Expand Down
49 changes: 34 additions & 15 deletions x-pack/plugins/code/public/components/editor/references_panel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { EuiAccordion, EuiButtonIcon, EuiLoadingKibana, EuiPanel, EuiTitle } from '@elastic/eui';
import {
EuiAccordion,
EuiButtonIcon,
EuiLoadingKibana,
EuiPanel,
EuiSpacer,
EuiText,
EuiTitle,
} from '@elastic/eui';
import { IPosition } from 'monaco-editor';
import queryString from 'querystring';
import React from 'react';
Expand Down Expand Up @@ -114,36 +122,47 @@ export class ReferencesPanel extends React.Component<Props, State> {
const lineNumberFn = (l: number) => {
return file.lineNumbers[l - 1];
};
const fileComponent = (
<React.Fragment>
<EuiText>
<a href={`#${this.computeUrl(file.uri)}`}>{file.file}</a>
</EuiText>
<EuiSpacer size="s" />
</React.Fragment>
);

return (
<CodeBlock
key={key}
language={file.language}
startLine={0}
code={file.code}
file={file.file}
folding={false}
lineNumbersFunc={lineNumberFn}
highlightRanges={file.highlights}
fileComponent={fileComponent}
onClick={this.onCodeClick.bind(this, file.lineNumbers, file.uri)}
/>
);
}

private onCodeClick(lineNumbers: string[], url: string, pos: IPosition) {
const { uri } = parseSchema(url)!;
const line = parseInt(lineNumbers[pos.lineNumber - 1], 10);
if (!isNaN(line)) {
let search = history.location.search;
if (search.startsWith('?')) {
search = search.substring(1);
}
const queries = queryString.parse(search);
const query = queryString.stringify({
...queries,
tab: 'references',
refUrl: this.props.refUrl,
});
history.push(`${uri}!L${line}:0?${query}`);
history.push(this.computeUrl(url, line));
}

private computeUrl(url: string, line?: number) {
const { uri } = parseSchema(url)!;
let search = history.location.search;
if (search.startsWith('?')) {
search = search.substring(1);
}
const queries = queryString.parse(search);
const query = queryString.stringify({
...queries,
tab: 'references',
refUrl: this.props.refUrl,
});
return line !== undefined ? `${uri}!L${line}:0?${query}` : `${uri}?${query}`;
}
}