Skip to content

[Code]click line number should stay in the same side tab #35396

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
Apr 23, 2019
Merged

[Code]click line number should stay in the same side tab #35396

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
21 changes: 15 additions & 6 deletions x-pack/plugins/code/public/components/editor/editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ export class EditorComponent extends React.Component<IProps> {
const { file } = this.props;
if (file && file.content) {
const { uri, path, revision } = file.payload;
this.loadText(file.content, uri, path, file.lang!, revision).then(() => {
const qs = this.props.location.search;
this.loadText(file.content, uri, path, file.lang!, revision, qs).then(() => {
if (this.props.revealPosition) {
this.revealPosition(this.props.revealPosition);
}
Expand All @@ -73,7 +74,7 @@ export class EditorComponent extends React.Component<IProps> {
}
}

public componentDidUpdate(prevProps: Props) {
public componentDidUpdate(prevProps: IProps) {
const { file } = this.props;
const { uri, path, revision } = file.payload;
const {
Expand All @@ -84,8 +85,9 @@ export class EditorComponent extends React.Component<IProps> {
path: routePath,
} = this.props.match.params;
const prevContent = prevProps.file && prevProps.file.content;
if (prevContent !== file.content) {
this.loadText(file.content!, uri, path, file.lang!, revision).then(() => {
const qs = this.props.location.search;
if (prevContent !== file.content || qs !== prevProps.location.search) {
this.loadText(file.content!, uri, path, file.lang!, revision, qs).then(() => {
if (this.props.revealPosition) {
this.revealPosition(this.props.revealPosition);
}
Expand Down Expand Up @@ -168,13 +170,20 @@ export class EditorComponent extends React.Component<IProps> {
this.blameWidgets = null;
}

private async loadText(text: string, repo: string, file: string, lang: string, revision: string) {
private async loadText(
text: string,
repo: string,
file: string,
lang: string,
revision: string,
qs: string
) {
if (this.monaco) {
this.editor = await this.monaco.loadFile(repo, file, text, lang, revision);
this.editor.onMouseDown((e: editorInterfaces.IEditorMouseEvent) => {
if (e.target.type === monaco.editor.MouseTargetType.GUTTER_LINE_NUMBERS) {
const uri = `${repo}/blob/${encodeRevisionString(revision)}/${file}`;
history.push(`/${uri}!L${e.target.position.lineNumber}:0`);
history.push(`/${uri}!L${e.target.position.lineNumber}:0${qs}`);
}
this.monaco!.container.focus();
});
Expand Down