Skip to content
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

Repl links fix #15174

Merged
merged 3 commits into from
Nov 10, 2016
Merged

Repl links fix #15174

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8394f64
Highlight relative paths in REPL
felixfbecker Nov 8, 2016
e998a29
Highlight links without a column in REPL
felixfbecker Nov 8, 2016
9cbfd08
Highlight file:// URIs correctly in REPL
felixfbecker Nov 8, 2016
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
6 changes: 3 additions & 3 deletions src/vs/workbench/parts/debug/electron-browser/replViewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export class ReplExpressionsRenderer implements IRenderer {
// group 3: line number
// group 4: column number
// eg: at Context.<anonymous> (c:\Users\someone\Desktop\mocha-runner\test\test.js:26:11)
/((\/|[a-zA-Z]:\\)[^\(\)<>\'\"\[\]]+):(\d+):(\d+)/
/(?:file:\/\/)?((\/|[a-zA-Z]:\\)?[^\(\)<>\'\"\[\]:]+):(\d+)(?::(\d+))?/
];

private static LINE_HEIGHT_PX = 18;
Expand Down Expand Up @@ -362,7 +362,7 @@ export class ReplExpressionsRenderer implements IRenderer {
link.textContent = text.substr(match.index, match[0].length);
link.title = isMacintosh ? nls.localize('fileLinkMac', "Click to follow (Cmd + click opens to the side)") : nls.localize('fileLink', "Click to follow (Ctrl + click opens to the side)");
linkContainer.appendChild(link);
link.onclick = (e) => this.onLinkClick(new StandardMouseEvent(e), resource, Number(match[3]), Number(match[4]));
link.onclick = (e) => this.onLinkClick(new StandardMouseEvent(e), resource, Number(match[3]), match[4] && Number(match[4]));

let textAfterLink = text.substr(match.index + match[0].length);
if (textAfterLink) {
Expand All @@ -378,7 +378,7 @@ export class ReplExpressionsRenderer implements IRenderer {
return linkContainer || text;
}

private onLinkClick(event: IMouseEvent, resource: uri, line: number, column: number): void {
private onLinkClick(event: IMouseEvent, resource: uri, line: number, column: number = 0): void {
const selection = window.getSelection();
if (selection.type === 'Range') {
return; // do not navigate when user is selecting
Expand Down