[RDY] Execute only first command in Live preview mode #8256

nimitbhardwaj · 2018-04-11T16:50:32Z

Previously, if we have set the inccommand, i.e. we are executing in the preview mode, then whole of the command would execute, it was not good as the command like :%s/hello/bye/g | q! would be a nuisance, this would quit as in preview whole of the command executes as there is a change in the cmdline text, so to handle it, execution of only the first command is necessary.

Closes #7494

nimitbhardwaj · 2018-04-11T17:08:03Z

I will add the test for it, but comments on it are ready

justinmk · 2018-04-11T19:38:00Z

src/nvim/ex_getln.c

@@ -1911,7 +1911,8 @@ static int command_line_changed(CommandLineState *s)
    //       - Immediately undo the effects.
    State |= CMDPREVIEW;
    emsg_silent++;  // Block error reporting as the command may be incomplete
-    do_cmdline(ccline.cmdbuff, NULL, NULL, DOCMD_KEEPLINE|DOCMD_NOWAIT);
+    do_cmdline(ccline.cmdbuff, NULL, NULL,
+               DOCMD_KEEPLINE|DOCMD_NOWAIT|DOCMD_PREVIEW);


State |= CMDPREVIEW; is set just above here, can that be checked instead of adding another flag?

Yes, Can be used, I didn't see if the State was a global variable, and declared DOCMD_PREVIEW as flags were passed by that way, ok I will use the State, as it was in the use

nimitbhardwaj · 2018-04-13T06:13:10Z

Test is made

bfredl · 2018-04-13T10:16:29Z

test/functional/ui/inccommand_spec.lua

+
+  it("only executes the first command in preview", function()
+    insert(default_text)
+    feed(':%s/two/three/g|q!')


This could be a bit racy, I would suggest adding a screen tests afterward (this will show that q! has been received by nvim)

justinmk · 2018-04-15T00:22:25Z

test/functional/ui/inccommand_spec.lua

+
+  it("only executes the first command in preview", function()
+    feed(':%s/two/three/g|q!')
+    eq(eval('v:null'), eval('v:exiting'))


this should go after the screen:expect(). the screen:expect() serves to "settle" the state, to avoid the race mentioned by @bfredl .

Also please rebase onto master to give quickbuild a chance to pass (it should be green now, usually).

Yeah sure I do it. though I assumed race was something related to race conditions like in multithreading. Didn't know its meaning, but having screen:expect was better as we can know the text was entered successfully

nimitbhardwaj · 2018-04-15T07:55:05Z

what is the reasons of failure

justinmk · 2018-04-21T10:55:53Z

test/functional/ui/inccommand_spec.lua

+      {15:~                   }|
+      :%s/two/three/g|q!^  |
+    ]])
+    eq(eval('v:null'), eval('v:exiting')) 


make testlint found trailing whitespace on this line, that's why the lint build is failing.

You can always check make lint to run all linters locally.

May be I missed it, I usually do this

justinmk · 2018-04-21T10:58:26Z

src/nvim/ex_docmd.c

@@ -603,6 +603,12 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline,
                              cmd_getline, cmd_cookie);
    recursive--;

+    // If in preview mode then only the first command separated
+    // '|' should be executed.


Brevity/concision:

// Only do the first '|'-separated command in preview-mode ('inccommand').

justinmk · 2018-04-21T11:08:07Z

Merged after making the changes mentioned above. Thanks!

fix #7494

nimitbhardwaj · 2018-04-21T11:54:54Z

OK thanks 😄

FEATURES: 3cc7ebf #7234 built-in VimL expression parser 6a7c904 #4419 implement <Cmd> key to invoke command in any mode b836328 #7679 'startup: treat stdin as text instead of commands' 58b210e :digraphs : highlight with hl-SpecialKey #2690 7a13611 #8276 'startup: Let `-s -` read from stdin' 1e71978 events: VimSuspend, VimResume #8280 1e7d5e8 #6272 'stdpath()' f96d99a #8247 server: introduce --listen e8c39f7 #8226 insert-mode: interpret unmapped META as ESC 98e7112 msg: do not scroll entire screen (#8088) f72630b #8055 let negative 'writedelay' show all redraws 5d2dd2e win: has("wsl") on Windows Subsystem for Linux #7330 a4f6cec cmdline: CmdlineEnter and CmdlineLeave autocommands (#7422) 207b7ca #6844 channels: support buffered output and bytes sockets/stdio API: f85cbea #7917 API: buffer updates 418abfc #6743 API: list information about all channels/jobs. 36b2e3f #8375 API: nvim_get_commands 273d2cd #8329 API: Make nvim_set_option() update `:verbose set …` 8d40b36 #8371 API: more reliable/descriptive VimL errors ebb1acb #8353 API: nvim_call_dict_function 9f994bb #8004 API: nvim_list_uis 3405704 #7520 API/UI: forward option updates to UIs 911b1e4 #7821 API: improve nvim_command_output WINDOWS OS: 9cefd83 #8084, #8516 build/win: support MSVC ee4e1fd win: Fix reading content from stdin (#8267) TUI: ffb8904 #8309 TUI: add support for mouse release events in urxvt 8d5a46e #8081 TUI: implement "standout" attribute 6071637 TUI: support TERM=konsole-256color 67848c0 #7653 TUI: report TUI info with -V3 ('verbose' >= 3) 3d0ee17 TUI/rxvt: enable focus-reporting d109f56 #7640 TUI: 'term' option: reflect effective terminal behavior FIXES: ed6a113 #8273 'job-control: avoid kill-timer race' 4e02f1a #8107 'jobs: separate process-group' 451c48a terminal: flush vterm output buffer on pty output #8486 5d6732f :checkhealth fixes #8335 53f11dc #8218 'Fix errors reported by PVS' d05712f inccommand: pause :terminal redraws (#8307) 51af911 inccommand: do not execute trailing commands #8256 84359a4 terminal: resize to the max dimensions (#8249) d49c1dd #8228 Make vim_fgets() return the same values as in Vim 60e96a4 screen: winhl=Normal:Background should not override syntax (#8093) 0c59ac1 #5908 'shada: Also save numbered marks' ba87a2c cscope: ignore EINTR while reading the prompt (#8079) b1412dc #7971 ':terminal Enter/Leave should not increment jumplist' 3a5721e TUI: libtermkey: force CSI driver for mouse input #7948 6ff13d7 #7720 TUI: faster startup 1c6e956 #7862 TUI: fix resize-related segfaults a58c909 #7676 TUI: always hide cursor when flushing, never flush buffers during unibilium output 303e1df #7624 TUI: disable BCE almost always 249bdb0 #7761 mark: Make sure that jumplist item will not have zero lnum 6f41ce0 #7704 macOS: Set $LANG based on the system locale a043899 #7633 'Retry fgets on EINTR' CHANGES: ad60927 #8304 default to 'nofsync' f3f1970 #8035 defaults: 'fillchars' a6052c7 #7984 defaults: sidescroll=1 b69fa86 #7888 defaults: enable cscopeverbose 7c4bb23 defaults: do :filetype stuff unless explicitly "off" 2aa308c #5658 'Apply :lmap in macros' 8ce6393 terminal: Leave 'relativenumber' alone (#8360) e46534b #4486 refactor: Remove maxmem, maxmemtot options 131aad9 win: defaults: 'shellcmdflag', 'shellxquote' #7343 c57d315 #8031 jobwait(): return -2 on interrupt also with timeout 6452831 clipboard: macOS: fallback to tmux if pbcopy is broken #7940 300d365 #7919 Make 'langnoremap' apply directly after a map ada1956 #7880 'lua/executor: Remove lightuserdata' INTERNAL: de0a954 #7806 internal statistics for list impl dee78a4 #7708 rewrite internal list impl

nimitbhardwaj changed the title ~~Execute only first command in Live preview mode~~ [RFC] Execute only first command in Live preview mode Apr 11, 2018

marvim added the RFC label Apr 11, 2018

justinmk reviewed Apr 11, 2018

View reviewed changes

nimitbhardwaj force-pushed the continousInccommand branch from ec58d92 to da17a43 Compare April 11, 2018 20:59

bfredl reviewed Apr 13, 2018

View reviewed changes

nimitbhardwaj force-pushed the continousInccommand branch from b56bb63 to 7bcee57 Compare April 13, 2018 11:13

nimitbhardwaj changed the title ~~[RFC] Execute only first command in Live preview mode~~ [RDY] Execute only first command in Live preview mode Apr 13, 2018

marvim added RDY and removed RFC labels Apr 13, 2018

justinmk reviewed Apr 15, 2018

View reviewed changes

nimitbhardwaj force-pushed the continousInccommand branch from 7bcee57 to 5c087e9 Compare April 15, 2018 07:17

nimitbhardwaj force-pushed the continousInccommand branch 4 times, most recently from 7676767 to ea257d9 Compare April 20, 2018 08:03

Execute only first command in Live preview mode

6014bfb

nimitbhardwaj force-pushed the continousInccommand branch from ea257d9 to 6014bfb Compare April 20, 2018 12:41

justinmk reviewed Apr 21, 2018

View reviewed changes

justinmk closed this Apr 21, 2018

justinmk removed the RDY label Apr 21, 2018

justinmk pushed a commit that referenced this pull request Apr 21, 2018

inccommand: do not execute trailing commands #8256

51af911

fix #7494

justinmk added the gsoc community: Google Summer of Code project label Apr 24, 2018

Uh oh!

[RDY] Execute only first command in Live preview mode #8256

[RDY] Execute only first command in Live preview mode #8256

Uh oh!

Conversation

nimitbhardwaj commented Apr 11, 2018

Uh oh!

nimitbhardwaj commented Apr 11, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nimitbhardwaj commented Apr 13, 2018

Uh oh!

bfredl Apr 13, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nimitbhardwaj commented Apr 15, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

justinmk commented Apr 21, 2018

Uh oh!

nimitbhardwaj commented Apr 21, 2018

Uh oh!

Uh oh!

bfredl Apr 13, 2018 •

edited

Loading

nimitbhardwaj commented Apr 15, 2018 •

edited

Loading