Adding line and column support for terminal #24832

timbanaveen · 2017-04-15T17:24:07Z

Adding line and column number support in terminal.
Tests are remaining.

mention-bot · 2017-04-15T17:24:08Z

@timbanaveen, thanks for your PR! By analyzing the history of the files in this pull request, we identified @Tyriar to be a potential reviewer.

msftclas · 2017-04-15T17:24:11Z

@timbanaveen,
Thanks for having already signed the Contribution License Agreement. Your agreement was validated by Microsoft. We will now review your pull request.
Thanks,
Microsoft Pull Request Bot

timbanaveen · 2017-04-15T17:26:47Z

Hi @Tyriar,

I have added code for adding support of line and column number in terminal. Please review.
Tests are remaining for these cases, will add them.

timbanaveen · 2017-04-16T08:50:22Z

Hi @Tyriar

I have added tests, Please review.

Thanks

Tyriar

Hi @timbanaveen, thanks for looking into this 😃

Tyriar · 2017-04-17T17:37:21Z

src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts

+	private _winLineAndColumnMatchIndex = 12;
+	private _unixLineAndColumnMatchIndex = 15;
+
+	private _lineAndColumnClauses = [


Any reason this isn't a constant up the top so it's shared between multiple instances of TerminalLinkHandler?

It will be common for all instances, will move it to top.

Tyriar · 2017-04-17T17:38:06Z

src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts

+			testLink('c:/foo:5:3', 'c:/foo', '5', '3');
+			testLink('c:/foo:line 5', 'c:/foo', '5');
+			testLink('c:/foo:line 5, column 3', 'c:/foo', '5', '3');
+			testLink('c:/foo(5)', 'c:/foo', '5');


It would be good to have example programs that output each format (and only add them if we have an example).

Nice suggestion 👍 , will program that.

Tyriar · 2017-04-17T17:39:38Z

src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts

+				fragment: Uri.parse(normalizedPath).fragment
+			});
+
+			return this._openerService.open(resource);


Does this._editorService.openEditor ignore the line/col?

I first tried with openEditor, but it didn't worked. Hence used open service.

Tyriar · 2017-04-17T17:41:45Z

src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts

+
+		let lineAndColumnMatchIndex = this._winLineAndColumnMatchIndex;
+
+		if (platform.Platform.Windows !== this._platform) {


Can you swap the if? Normally we put the constant expression on the right: this._platform !== platform.Platform.Windows

Sure, will do that

Tyriar · 2017-04-17T17:41:53Z

src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts

+		}
+
+		for (let i = 0; i < lineColumnClauseLength; i++) {
+			let lineMatchIndex = lineAndColumnMatchIndex + 6 * i;


while adding line and column regex, i have appended all regex clauses and each clause have 6 groups hence, after performing regex line and column information from each clause will be present at distance of 6. I think it would be better to have this value as constant up at top.

👍 to constant

Tyriar · 2017-04-17T17:44:34Z

src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts

 		return this._xterm.registerLinkMatcher(this._localLinkRegex, wrappedHandler, {
-			matchIndex: 1,


Don't we need this?

Match index 1 only matches first group of regex, but we need other groups as well which have line and column number information.

But matchIndex is still generally supported right? Custom link matchers need to be able to specify it still.

@Tyriar , Yes for custom link matchers MatchIndex is supported, it will follow given matchIndex.

Tyriar · 2017-04-17T17:47:23Z

src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts

-			const resource = Uri.file(path.normalize(path.resolve(resolvedLink)));
-			return this._editorService.openEditor({ resource }).then(() => void 0);
+
+			let normalizedPath = path.normalize(path.resolve(resolvedLink));


Can this be pulled into a formatLocalLinkPath or similar named function that returns a URI in form <path>#line,col?

Yes, that will be better will do that

Tyriar · 2017-04-17T18:45:39Z

Related: #24451

…aths

…nk url

…t links.

timbanaveen · 2017-04-18T16:33:04Z

Hi @Tyriar ,

I have added suggested changes, Please review

Thanks

Tyriar · 2017-04-19T16:23:12Z

Thanks @timbanaveen, I'll give this a proper look after I've caught up on my issues (just took a week off so I'm pretty backed up).

…mn-support-terminal

Tyriar · 2017-04-24T19:55:27Z

@timbanaveen this is awesome, I made a few minor changes and merging after I make sure tests are all good 🎉

This should make it into the April release (1.12) unless any big issues are found when we test.

timbanaveen · 2017-04-27T13:21:04Z

@Tyriar Thanks for the help 🙇‍♂️ , learned many things from code review and minor changes that you did.

Tyriar · 2017-04-27T16:44:43Z

@timbanaveen people love it btw https://twitter.com/Tyriar/status/856616415909904384 😃

No major issues found during test #25331

timbanaveen · 2017-04-28T17:20:14Z

@Tyriar , Cool it is 😄 , Thanks. Can i share this on Facebook ?

Tyriar · 2017-04-28T17:43:05Z

@timbanaveen go for it 😄

msftclas added the cla-already-signed label Apr 15, 2017

timbanaveen changed the title ~~WIP: Adding line and column support for terminal~~ Adding line and column support for terminal Apr 17, 2017

Tyriar requested changes Apr 17, 2017

View reviewed changes

Tyriar self-assigned this Apr 17, 2017

Tyriar mentioned this pull request Apr 17, 2017

Merge link detection code between terminal, debug console and exception widget #24489

Closed

NKumar2 added 5 commits April 18, 2017 21:59

WIP: Adding line and column support for terminal

425ed1b

Adding space along with non-breaking space in regex, fixes for unix p…

441099c

…aths

Adding tests for getting information of line and column along with li…

8d5be51

…nk url

moving object level constants to class level, seprate method to forma…

566e2d7

…t links.

Adding code to generate links tests cases.

325d9a7

timbanaveen force-pushed the 21472-adding-line-column-support-terminal branch from 739f245 to 325d9a7 Compare April 18, 2017 16:30

Tyriar added 4 commits April 24, 2017 12:42

Consolidate link regex variables

94affbf

Tidy comments

e848c21

Only evaluate lineAndColumnClause once

3247d10

Make extractLineColumnInfo more concise

4f6cb99

Tyriar approved these changes Apr 24, 2017

View reviewed changes

Tyriar added this to the April 2017 milestone Apr 24, 2017

Merge remote-tracking branch 'ups/master' into 21472-adding-line-colu…

3984e25

…mn-support-terminal

Tyriar merged commit 15c1570 into microsoft:master Apr 24, 2017

Tyriar mentioned this pull request Apr 24, 2017

Support line ranges in links and to navigate to file to a particular line column #21472

Closed

kieferrm mentioned this pull request May 4, 2017

[Feature request] Take into account location information in paths when following them in the terminal #25880

Closed

Tyriar mentioned this pull request Sep 12, 2017

Fix terminal link tests #34193

Closed

Munter mentioned this pull request May 20, 2018

Failing tests no longer produce stack traces with clickable file links mochajs/mocha#3383

Closed

4 tasks

Vidminas mentioned this pull request Aug 7, 2019

Add end line + column parsing in links #78624

Closed

github-actions bot locked and limited conversation to collaborators Mar 27, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding line and column support for terminal #24832

Adding line and column support for terminal #24832

timbanaveen commented Apr 15, 2017 •

edited by Tyriar

mention-bot commented Apr 15, 2017

msftclas commented Apr 15, 2017

timbanaveen commented Apr 15, 2017

timbanaveen commented Apr 16, 2017

Tyriar left a comment

Tyriar Apr 17, 2017

timbanaveen Apr 18, 2017

Tyriar Apr 17, 2017

timbanaveen Apr 18, 2017

Tyriar Apr 17, 2017

timbanaveen Apr 18, 2017

Tyriar Apr 17, 2017

timbanaveen Apr 18, 2017

Tyriar Apr 17, 2017

timbanaveen Apr 18, 2017

Tyriar Apr 18, 2017

Tyriar Apr 17, 2017

timbanaveen Apr 18, 2017

Tyriar Apr 18, 2017

timbanaveen Apr 19, 2017 •

edited

Tyriar Apr 17, 2017

timbanaveen Apr 18, 2017

Tyriar commented Apr 17, 2017

timbanaveen commented Apr 18, 2017

Tyriar commented Apr 19, 2017

Tyriar commented Apr 24, 2017

timbanaveen commented Apr 27, 2017

Tyriar commented Apr 27, 2017

timbanaveen commented Apr 28, 2017

Tyriar commented Apr 28, 2017


		let lineAndColumnMatchIndex = this._winLineAndColumnMatchIndex;

		if (platform.Platform.Windows !== this._platform) {

		return this._xterm.registerLinkMatcher(this._localLinkRegex, wrappedHandler, {
		matchIndex: 1,

Adding line and column support for terminal #24832

Adding line and column support for terminal #24832

Conversation

timbanaveen commented Apr 15, 2017 • edited by Tyriar

mention-bot commented Apr 15, 2017

msftclas commented Apr 15, 2017

timbanaveen commented Apr 15, 2017

timbanaveen commented Apr 16, 2017

Tyriar left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

timbanaveen Apr 19, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Tyriar commented Apr 17, 2017

timbanaveen commented Apr 18, 2017

Tyriar commented Apr 19, 2017

Tyriar commented Apr 24, 2017

timbanaveen commented Apr 27, 2017

Tyriar commented Apr 27, 2017

timbanaveen commented Apr 28, 2017

Tyriar commented Apr 28, 2017

timbanaveen commented Apr 15, 2017 •

edited by Tyriar

timbanaveen Apr 19, 2017 •

edited