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.

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

[RDY] Fix for Wrong terminfo value for "standout" #8081

Closed
wants to merge 1 commit into from

Conversation

nimitbhardwaj
Copy link
Contributor

@nimitbhardwaj nimitbhardwaj commented Feb 28, 2018

Fix the wrong terminfo value sent during the "standout"
Closes #8054

@jamessan
Copy link
Member

Please provide a useful commit message.

@nimitbhardwaj nimitbhardwaj changed the title [RFC] Wrong terminfo value for "standout" [RFC] Fix for Wrong terminfo value for "standout" Feb 28, 2018
@nimitbhardwaj
Copy link
Contributor Author

May be this is fine

@marvim marvim added the RFC label Feb 28, 2018
@bfredl
Copy link
Member

bfredl commented Feb 28, 2018

Corresponding change should also be done in hlattrs2dict in src/nvim/ui.c (separate "standout" key)

@nimitbhardwaj
Copy link
Contributor Author

its done, hope it don't disturbs the present tests, I will check the logs if it disturbs tests

@@ -186,6 +186,10 @@ Dictionary hlattrs2dict(const HlAttrs *aep, bool use_rgb)
PUT(hl, "bold", BOOLEAN_OBJ(true));
}

if (mask & HL_STANDOUT) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also remove HL_STANDOUT from "reverse" condition below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yes, I didn't see it, thanks for pointing out

@bfredl
Copy link
Member

bfredl commented Feb 28, 2018

If test is disturbed that is good: now we know what test needs to be updated for new behavior. If no test is disturbed, new test should be added.

@nimitbhardwaj
Copy link
Contributor Author

Oks, cool

@nimitbhardwaj
Copy link
Contributor Author

it does not seems like the test is failed.
So a new test should be added?

@teto
Copy link
Member

teto commented Mar 3, 2018

you should test for standout in test/functional/api/highlight_spec.lua, possibly also once in ui/highlight_spec.lua.

@nimitbhardwaj
Copy link
Contributor Author

I made the test hope its correct

[3] = {standout = true, underline = true,
background = Screen.colors.Gray90}
})
feed_command('hi CursorLine cterm=standout,underline term=standout,underline gui=standout,underline')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

term= can be removed, only cterm and gui should be significant.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, yeah, got it

@nimitbhardwaj
Copy link
Contributor Author

Done, I think its work is complete now, unless any other change is necessary, I will squash the commits if needed

@nimitbhardwaj
Copy link
Contributor Author

Squashed

@nimitbhardwaj nimitbhardwaj changed the title [RFC] Fix for Wrong terminfo value for "standout" [RFY] Fix for Wrong terminfo value for "standout" Mar 23, 2018
@nimitbhardwaj nimitbhardwaj changed the title [RFY] Fix for Wrong terminfo value for "standout" [RDY] Fix for Wrong terminfo value for "standout" Mar 23, 2018
@marvim marvim added RDY and removed RFC labels Mar 23, 2018
@justinmk justinmk added this to the 0.2.3 milestone Mar 26, 2018
@@ -540,6 +540,27 @@ describe("'listchars' highlight", function()
]])
end)

it("'cursorline' and 'standout'", function()
Copy link
Member

@justinmk justinmk Mar 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't relevant to the describe("'listchars' highlight", group, so I moved it.

justinmk pushed a commit that referenced this pull request Mar 27, 2018
@justinmk
Copy link
Member

Merged, thanks @nimitbhardwaj !

@justinmk justinmk closed this Mar 27, 2018
@justinmk justinmk removed the RDY label Mar 27, 2018
@justinmk justinmk added the gsoc community: Google Summer of Code project label Apr 24, 2018
justinmk added a commit that referenced this pull request Jun 11, 2018
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
@blueyed
Copy link
Contributor

blueyed commented Jul 8, 2018

Standout was not working for me: can you please review/check #8708?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
gsoc community: Google Summer of Code project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants