Common tree highlight groups #158

bini-x · 2024-09-26T13:07:20Z

Closes #157.

AlexvZyl · 2024-09-26T13:25:00Z

Can you please rather make the changes from the dev branch?

AlexvZyl · 2024-09-26T13:26:10Z

@5-pebbles I forgot this was going to happen with our dev setup. I assume it's fine having people submit PRs from the dev branch.

AlexvZyl · 2024-09-26T13:30:12Z

@bini-x Wait, leave this PR as is for now.

bini-x · 2024-09-26T13:30:52Z

Okay

AlexvZyl · 2024-09-26T13:35:08Z

@5-pebbles Okay I am going to have to rethink that lol.

@bini-x I see your editor formatted the entire file, please undo that.

bini-x · 2024-09-26T13:47:47Z

Ok

bini-x · 2024-09-26T13:52:12Z

Can you check it now @AlexvZyl

AlexvZyl · 2024-09-26T14:11:00Z

Run this in the root of nordic:

stylua --config-path=.stylua.toml .

You might have to install stylua first.

bini-x · 2024-09-26T14:13:13Z

I just saw what my formatter did. sorry. i fixed it all now

bini-x · 2024-09-26T14:13:21Z

@AlexvZyl

AlexvZyl · 2024-09-26T14:13:30Z

Great, now can you share a preview of the new changes?

bini-x · 2024-09-26T14:16:19Z

yes

you can see the color of root name is now dark blue (blue0 of color palette), git untracked is now red_b and in the next image you can see the dialog that opens when you add/rename/delete a file/directory is orange_b:

bini-x · 2024-09-26T14:44:05Z

@AlexvZyl any comments?

AlexvZyl · 2024-09-26T14:56:44Z

Will reply, gonna go mountain biking

bini-x · 2024-09-26T15:19:28Z

just changed some colors i thought were bad earlier

AlexvZyl · 2024-09-27T06:41:58Z

Definitely like iteration two more :)

AlexvZyl · 2024-09-27T06:42:36Z

Check the tests. Somewhere you misspelled fg.

@5-pebbles These tests are lovely

AlexvZyl · 2024-09-27T06:43:52Z

Ah no, you used orange directly. Orange is a table.

bini-x · 2024-09-27T06:44:52Z

Oh okay. What's the name of the first orange in palette?

bini-x · 2024-09-27T06:46:13Z

I'll try to find and I'll fix it

AlexvZyl · 2024-09-27T06:51:38Z

https://github.com/AlexvZyl/nordic.nvim/blob/main/lua/nordic/colors/nordic.lua

AlexvZyl · 2024-09-28T09:51:59Z

Also quick tip, in that screenshot you could do:

/FileIcon

bini-x · 2024-09-28T10:26:43Z

@AlexvZyl you can check it now, because I wasn't sure if these were groups or not

AlexvZyl · 2024-09-28T10:35:18Z

That looks good. Will test it locally later.

AlexvZyl · 2024-09-29T16:37:28Z

I actually don't use those tree plugins anymore. Would you mind sharing screenshots?

bini-x · 2024-09-29T16:41:39Z

yes, I can but just for NeoTree because I don't use nvimTree

bini-x · 2024-09-29T16:43:04Z

you can see the dialog prompt has the bg white now, git untracked is orange and rootname is white.

5-pebbles

I like the merger of tree plugins a lot!

lua/nordic/groups/integrations.lua

5-pebbles

Everything looks good to me : )

bini-x · 2024-10-02T13:16:28Z

@AlexvZyl have you seen the final result yet?

AlexvZyl · 2024-10-02T13:23:17Z

@AlexvZyl have you seen the final result yet?

I don't miss a thing :) I promise I will properly check when I get the chance.

bini-x · 2024-10-02T19:50:44Z

@5-pebbles what do you think about making the root directory's name bold?

bini-x · 2024-10-02T19:52:03Z

because in cases like this, if it isn't bold it looks the same as a file's name:

5-pebbles · 2024-10-02T20:23:27Z

@5-pebbles what do you think about making the root directory's name bold?

I actually really like that. Go for it!

5-pebbles

That looks great!

geofflane · 2024-10-04T17:11:43Z

👍🏼 To this. Just noticed the same issue.

AlexvZyl · 2024-10-12T15:35:55Z

lua/nordic/groups/integrations.lua

+    G.TreeRootFolder = { fg = C.gray4 }
+    G.TreeRootName = { fg = C.fg, bold = true }


I think these two are the same thing?

AlexvZyl · 2024-10-12T15:36:18Z

lua/nordic/groups/integrations.lua

+    G.TreeFileIcon = { fg = C.blue2 }
+    G.TreeFileNameOpened = { fg = C.fg }
+    G.TreeSpecialFile = { fg = C.magenta.bright }
+    G.TreeGitConflict = { fg = C.magenta.bright }


Conflict rather red?

AlexvZyl · 2024-10-12T15:37:21Z

lua/nordic/groups/integrations.lua

+    G.TreeGitModified = { fg = C.git.change }
+    G.TreeGitDirty = { fg = C.gray4 }
+    G.TreeGitAdded = { fg = C.git.add }
+    G.TreeGitNew = { fg = C.gray4 }
+    G.TreeGitDeleted = { fg = C.gray4 }
+    G.TreeGitStaged = { fg = C.gray4 }
+    G.TreeGitUntracked = { fg = C.orange.base }


IMO these "identifiers" should either:

All be subtle and grey (I prefer this)

Or have their respective colors.

@5-pebbles Opinion?

I would personally prefer colors as the default.

My repos are usually an unstaged mess, and the colors help prevent the spread of chaos, but that's more of a "me problem".

I think either way works; the people who don't like whatever we pick will just change it in their own configs. Though, it would be worth adding the unchosen variation to the list of common configurations that I plan on writing someday.

TLDR: I don't know which is better...

which gray do you think should they be?

I think most people expect colors. So go with that.

AlexvZyl · 2024-10-12T15:37:47Z

lua/nordic/groups/integrations.lua

+    G.TreeGitDeleted = { fg = C.gray4 }
+    G.TreeGitStaged = { fg = C.gray4 }
+    G.TreeGitUntracked = { fg = C.orange.base }
+    G.TreeTitleBar = { fg = C.black0, bg = C.blue2, bold = true }


I think this should maybe link to Winbar?

is it just link = "Winbar", because I can't find anything with the name "Winbar" in this file

is it just link = "Winbar", because I can't find anything with the name "Winbar" in this file

Yup, that should work:

nordic.nvim/lua/nordic/groups/native.lua

Line 179 in 1ee4044

G.WinBar = { bg = C.bg_dark, fg = C.gray5 }

For future reference if you click the search bar on GitHub via this pr it will search the current repos contents. You can do the same locally with something like ripgrep or telescopes built in ripgrep picker.

AlexvZyl · 2024-10-12T15:38:13Z

lua/nordic/groups/integrations.lua

+    G.TreeGitStaged = { fg = C.gray4 }
+    G.TreeGitUntracked = { fg = C.orange.base }
+    G.TreeTitleBar = { fg = C.black0, bg = C.blue2, bold = true }
+    G.TreeFloatBorder = { fg = C.blue2, bg = C.gray0}


This should use our float colors.

can you tell me the float colors?

You can find the extended palette values and their definitions here:

nordic.nvim/lua/nordic/colors/init.lua

Lines 59 to 63 in 1ee4044

-- Floating windows

C.bg_float = (options.transparent.float and C.none) or ((options.swap_backgrounds and C.gray0) or C.black1)

C.fg_float = C.fg

C.bg_float_border = C.bg_float

C.fg_float_border = C.border_fg

AlexvZyl · 2024-10-12T15:38:44Z

lua/nordic/groups/integrations.lua

+    G.TreeIndentMarker = { fg = C.gray4 }
+    G.TreeSymlink = { fg = C.blue2 }
+    G.TreeFolderName = { fg = C.blue1 }
+    G.TreeWinSeparator = { fg = C.bg_dark, bg = C.bg }


This should link to the existing win sep.

Thanks for your reply, Alex!
Couldn't reply earlier because I had some other things to do.
I'll see what I can do and I'll try to finish it as soon as I can.

i can't find the existing window separator

just use: link = "WinSeparator"
see definition:

nordic.nvim/lua/nordic/groups/native.lua

Line 135 in 1ee4044

G.WinSeparator = { fg = C.border_fg, bg = C.border_bg } -- the column separating vertically split windows

Sorry, should just have told you what the hl is 😂

Np, I'm thinking now how could I not find the window separator, it was there the whole time...😅

bini-x · 2024-10-21T17:44:42Z

@AlexvZyl added the requested changes, hopefully I didn't forget anything

bini-x · 2024-10-21T17:47:01Z

i'm not so sure about line 116 tho

changed some colors for neotree

59c900a

AlexvZyl changed the base branch from main to dev September 26, 2024 13:23

AlexvZyl deleted the branch AlexvZyl:main September 26, 2024 13:32

AlexvZyl closed this Sep 26, 2024

AlexvZyl reopened this Sep 26, 2024

changed some neotree colors

2c1399d

changed some neotree colors

3027f29

fixed the formatting

b680b04

improved some colors

9e49ff1

fixed. maybe...:)

b8731e7

AlexvZyl marked this pull request as ready for review September 28, 2024 10:36

AlexvZyl added the Enhancement New feature, request or suggestion label Sep 28, 2024

AlexvZyl assigned bini-x Sep 28, 2024

5-pebbles reviewed Sep 29, 2024

View reviewed changes

lua/nordic/groups/integrations.lua Outdated Show resolved Hide resolved

lua/nordic/groups/integrations.lua Outdated Show resolved Hide resolved

lua/nordic/groups/integrations.lua Outdated Show resolved Hide resolved

bini-x added 4 commits September 29, 2024 19:12

changed TreeCursorLine bg

4826461

fixed formatting

b43606d

final... maybe

5eb0697

final... maybe (v2)

b57ca97

5-pebbles previously approved these changes Sep 29, 2024

View reviewed changes

made rootName bold

c8ec4b1

bini-x dismissed 5-pebbles’s stale review via c8ec4b1 October 3, 2024 05:05

5-pebbles previously approved these changes Oct 3, 2024

View reviewed changes

AlexvZyl requested changes Oct 12, 2024

View reviewed changes

new changes made

fd075e8

bini-x dismissed 5-pebbles’s stale review via fd075e8 October 21, 2024 17:43

		G.TreeRootFolder = { fg = C.gray4 }
		G.TreeRootName = { fg = C.fg, bold = true }

	-- Floating windows
	C.bg_float = (options.transparent.float and C.none) or ((options.swap_backgrounds and C.gray0) or C.black1)
	C.fg_float = C.fg
	C.bg_float_border = C.bg_float
	C.fg_float_border = C.border_fg

Common tree highlight groups #158

Are you sure you want to change the base?

Common tree highlight groups #158

Conversation

bini-x commented Sep 26, 2024 • edited by AlexvZyl Loading

AlexvZyl commented Sep 26, 2024

AlexvZyl commented Sep 26, 2024

AlexvZyl commented Sep 26, 2024

bini-x commented Sep 26, 2024

AlexvZyl commented Sep 26, 2024

bini-x commented Sep 26, 2024

bini-x commented Sep 26, 2024

AlexvZyl commented Sep 26, 2024

bini-x commented Sep 26, 2024

bini-x commented Sep 26, 2024

AlexvZyl commented Sep 26, 2024

bini-x commented Sep 26, 2024

bini-x commented Sep 26, 2024

AlexvZyl commented Sep 26, 2024

bini-x commented Sep 26, 2024

AlexvZyl commented Sep 27, 2024

AlexvZyl commented Sep 27, 2024

AlexvZyl commented Sep 27, 2024

bini-x commented Sep 27, 2024

bini-x commented Sep 27, 2024

AlexvZyl commented Sep 27, 2024

AlexvZyl commented Sep 28, 2024

bini-x commented Sep 28, 2024

AlexvZyl commented Sep 28, 2024

AlexvZyl commented Sep 29, 2024

bini-x commented Sep 29, 2024

bini-x commented Sep 29, 2024

5-pebbles left a comment

Choose a reason for hiding this comment

5-pebbles left a comment

Choose a reason for hiding this comment

bini-x commented Oct 2, 2024

AlexvZyl commented Oct 2, 2024

bini-x commented Oct 2, 2024

bini-x commented Oct 2, 2024 • edited Loading

5-pebbles commented Oct 2, 2024

5-pebbles left a comment

Choose a reason for hiding this comment

geofflane commented Oct 4, 2024

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bini-x commented Oct 21, 2024

bini-x commented Oct 21, 2024

bini-x commented Sep 26, 2024 •

edited by AlexvZyl

Loading

bini-x commented Oct 2, 2024 •

edited

Loading