Accept +num flag for opening at line number #5603

nabaco · 2023-01-20T03:00:26Z

Resolves #5437
Added basic logic for opening files with +N argument, where N is the line number.
Can be mentioned after each file. If mentioned several times, latest one will be taken.

This is a very basic implementation, since in Vim/NeoVim the + arguments runs a command in the editor.
With some help, I can try to change the implementation. Need to understand how I can use the execute() method upon startup. (helix-term/src/commands.rs:164)

P.S: I'm new to Rust, so any comments about my code are more than welcome :)

nabaco · 2023-01-20T05:53:53Z

Need to fix Clippy warnings. I'll do that, probably after the weekend.
I've managed to do an implementation where + executes any command, but it doesn't work in the form of +11. I'm suspecting Shellwords::from(&str) is swallowing the numbers for some reason.

Anyone willing to help me with this?

nabaco · 2023-01-20T06:09:38Z

I've pushed my second implementation as a second commit, for review and discussion. In the second implementation, +11 doesn't work but +'open README.md', +'goto 11', and +'g 11' work like a charm.
+q panics 😞 but I don't think it's important right now since I don't see +q being a very important or common usecase.

Anyway, any comments, suggestions, reviews are more than welcome.

nabaco

Here is the issue. I'm missing the number in +11 since it's the first element. Need to either add an if here or insert "goto" into command

nabaco · 2023-01-20T13:24:53Z

Fixed the numeric command issue in the final commit. Tested with the following commands:

$ ./target/debug/hx README.md +11
$ ./target/debug/hx README.md +'g 11'
$ ./target/debug/hx README.md +'goto 11'
$ ./target/debug/hx +'open README.md' +11
$ ./target/debug/hx +'open README.md' +'theme acme'

helix-term/src/args.rs

helix-term/src/main.rs

pascalkuthe · 2023-01-21T21:33:09Z

Maybe this was already discussed (altough I didn't find anything) but what about using :open <path>:<line>:<column> here? You could reuse the parse_file function and would stay more consisntent with the CLI and also gf if something like #5260 is merged

nabaco · 2023-01-22T09:14:58Z

@pascalkuthe that was mentioned in the original issue: #5437.
I'll move the execution part to a separate PR. I agree that it somewhat a hack and needs better design.

the-mikedavis · 2023-06-18T18:12:12Z

helix-term/src/args.rs

@@ -17,6 +17,7 @@ pub struct Args {
    pub log_file: Option<PathBuf>,
    pub config_file: Option<PathBuf>,
    pub files: Vec<(PathBuf, Position)>,
+    pub line_number: usize,


It looks like this isn't used outside of the parse_args function so it could be a local in that function: let mut line_number = 0;

the-mikedavis · 2023-06-18T18:16:01Z

helix-term/src/args.rs

+                    args.line_number = match arg.parse() {
+                        Ok(n) => n,
+                        _ => anyhow::bail!("bad line number after +"),
+                    };
+                    if args.line_number > 0 {
+                        args.line_number -= 1;
+                    }


Suggested change

args.line_number = match arg.parse() {

Ok(n) => n,

_ => anyhow::bail!("bad line number after +"),

};

if args.line_number > 0 {

args.line_number -= 1;

}

args.line_number = match arg.parse::<usize>() {

Ok(n) => n.saturating_sub(1),

_ => anyhow::bail!("bad line number after +"),

};

the-mikedavis · 2023-06-18T18:16:36Z

helix-term/src/main.rs

@@ -73,6 +73,7 @@ FLAGS:
    -V, --version                  Prints version information
    --vsplit                       Splits all given files vertically into different windows
    --hsplit                       Splits all given files horizontally into different windows
+    +N                             Goto line number N


Suggested change

+N Goto line number N

+N Open the first given file at line number N

the-mikedavis · 2023-06-19T07:16:18Z

helix-term/src/args.rs

@@ -73,6 +74,16 @@ impl Args {
                        }
                    }
                }
+                arg if arg.starts_with('+') => {
+                    let arg = arg.get(1..).unwrap();


This can also be cleaned up a little: &arg[1..]

…-editor#5603

* Accept +num flag for opening at line number * Update +N argument feature according to feedback in original PR #5603 * Only override the line number of the first file if +N is specified --------- Co-authored-by: Nachum Barcohen <38861757+nabaco@users.noreply.github.com>

kirawi · 2023-10-12T14:21:17Z

Closed by #8521

…#8521) * Accept +num flag for opening at line number * Update +N argument feature according to feedback in original PR helix-editor#5603 * Only override the line number of the first file if +N is specified --------- Co-authored-by: Nachum Barcohen <38861757+nabaco@users.noreply.github.com>

CBenoit added A-helix-term Area: Helix term improvements S-waiting-on-review Status: Awaiting review from a maintainer. labels Jan 20, 2023

nabaco commented Jan 20, 2023

View reviewed changes

the-mikedavis reviewed Jan 21, 2023

View reviewed changes

helix-term/src/args.rs Outdated Show resolved Hide resolved

helix-term/src/args.rs Outdated Show resolved Hide resolved

helix-term/src/main.rs Outdated Show resolved Hide resolved

pascalkuthe added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from a maintainer. labels Jan 21, 2023

Accept +num flag for opening at line number

eaea712

nabaco force-pushed the plus-goto-argument branch from 9575ffd to eaea712 Compare January 23, 2023 18:47

the-mikedavis added S-waiting-on-review Status: Awaiting review from a maintainer. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 23, 2023

gibbz00 mentioned this pull request Jan 24, 2023

Unify and clarify config loading #5636

Closed

5 tasks

the-mikedavis mentioned this pull request Feb 12, 2023

Add prefix position to hx CLI file args #5945

Closed

the-mikedavis reviewed Jun 18, 2023

View reviewed changes

the-mikedavis added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from a maintainer. labels Jun 18, 2023

the-mikedavis reviewed Jun 19, 2023

View reviewed changes

bjorn-ove added a commit to bjorn-ove/helix that referenced this pull request Oct 11, 2023

Update +N argument feature according to feedback in original PR helix…

6410e65

…-editor#5603

bjorn-ove mentioned this pull request Oct 11, 2023

Add +N CLI argument to jump to first file's line number #8521

Merged

kirawi closed this Oct 12, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Accept +num flag for opening at line number #5603

Accept +num flag for opening at line number #5603

nabaco commented Jan 20, 2023

nabaco commented Jan 20, 2023 •

edited

Loading

nabaco commented Jan 20, 2023 •

edited

Loading

nabaco left a comment

nabaco commented Jan 20, 2023

pascalkuthe commented Jan 21, 2023

nabaco commented Jan 22, 2023

the-mikedavis Jun 18, 2023

the-mikedavis Jun 18, 2023

the-mikedavis Jun 18, 2023

the-mikedavis Jun 19, 2023

kirawi commented Oct 12, 2023

	+N Goto line number N
	+N Open the first given file at line number N

Accept +num flag for opening at line number #5603

Accept +num flag for opening at line number #5603

Conversation

nabaco commented Jan 20, 2023

nabaco commented Jan 20, 2023 • edited Loading

nabaco commented Jan 20, 2023 • edited Loading

nabaco left a comment

Choose a reason for hiding this comment

nabaco commented Jan 20, 2023

pascalkuthe commented Jan 21, 2023

nabaco commented Jan 22, 2023

the-mikedavis Jun 18, 2023

Choose a reason for hiding this comment

the-mikedavis Jun 18, 2023

Choose a reason for hiding this comment

the-mikedavis Jun 18, 2023

Choose a reason for hiding this comment

the-mikedavis Jun 19, 2023

Choose a reason for hiding this comment

kirawi commented Oct 12, 2023

nabaco commented Jan 20, 2023 •

edited

Loading

nabaco commented Jan 20, 2023 •

edited

Loading