Skip to content

feat: support multiple terminal fonts #17257

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.

Sign up for GitHub

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

Merged
merged 22 commits into from
Apr 7, 2025
+813 −228
Merged

feat: support multiple terminal fonts #17257

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c309664
feat: switch terminal fonts
mtojek Apr 4, 2025
d9e9627
Rename GetAppearanceSettings to GetUserThemePreferences
mtojek Apr 4, 2025
fd6c9e4
GetUserTerminalFont
mtojek Apr 4, 2025
40ee863
ibm-plex-mono
mtojek Apr 4, 2025
6a6272b
form
mtojek Apr 4, 2025
40ee797
Terminal uses font
mtojek Apr 4, 2025
ae1cb12
Fix golden
mtojek Apr 4, 2025
8f9e313
fix version
mtojek Apr 4, 2025
94a3587
WIP
mtojek Apr 4, 2025
bdbae61
jest
mtojek Apr 4, 2025
33a6177
dbauthz_test.g
mtojek Apr 4, 2025
23a0768
check
mtojek Apr 4, 2025
9bed6bc
go tests
mtojek Apr 4, 2025
f4c24ef
fix
mtojek Apr 4, 2025
449e079
t.Parallel
mtojek Apr 4, 2025
2a68eeb
Review fixes
mtojek Apr 7, 2025
b9fa3fe
make gen
mtojek Apr 7, 2025
45245fc
fixes
mtojek Apr 7, 2025
922bac2
fix
mtojek Apr 7, 2025
59854a6
Fix
mtojek Apr 7, 2025
61fca63
Fix
mtojek Apr 7, 2025
b22e626
cleanup
mtojek Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
go tests
  • Loading branch information
@mtojek
mtojek committed Apr 4, 2025
commit 9bed6bc668f208f966778a2bab19314d037d0ff3
7 changes: 3 additions & 4 deletions coderd/users_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1972,10 +1972,10 @@
require.NoError(t, err)
}

func TestUserTerminalFont(t *testing.T) {

Check failure on line 1975 in coderd/users_test.go

View workflow job for this annotation

GitHub Actions / lint 

TestUserTerminalFont's subtests should call t.Parallel (tparallel)
t.Parallel()

t.Run("valid font", func(t *testing.T) {

Check failure on line 1978 in coderd/users_test.go

View workflow job for this annotation

GitHub Actions / lint 

Function TestUserTerminalFont missing the call to method parallel in the test run (paralleltest)
adminClient := coderdtest.New(t, nil)
firstUser := coderdtest.CreateFirstUser(t, adminClient)
client, _ := coderdtest.CreateAnotherUser(t, adminClient, firstUser.OrganizationID)
Expand All @@ -1984,7 +1984,7 @@
defer cancel()

// given
initial, err := client.GetUserAppearanceSettings(ctx, "me")

Check failure on line 1987 in coderd/users_test.go

View workflow job for this annotation

GitHub Actions / lint 

ineffectual assignment to err (ineffassign)
require.Equal(t, codersdk.TerminalFontName(""), initial.TerminalFont)

// when
Expand All @@ -1998,7 +1998,7 @@
require.Equal(t, codersdk.TerminalFontFiraCode, updated.TerminalFont)
})

t.Run("unsupported font", func(t *testing.T) {

Check failure on line 2001 in coderd/users_test.go

View workflow job for this annotation

GitHub Actions / lint 

Function TestUserTerminalFont missing the call to method parallel in the test run (paralleltest)
adminClient := coderdtest.New(t, nil)
firstUser := coderdtest.CreateFirstUser(t, adminClient)
client, _ := coderdtest.CreateAnotherUser(t, adminClient, firstUser.OrganizationID)
Expand All @@ -2007,7 +2007,7 @@
defer cancel()

// given
initial, err := client.GetUserAppearanceSettings(ctx, "me")

Check failure on line 2010 in coderd/users_test.go

View workflow job for this annotation

GitHub Actions / lint 

ineffectual assignment to err (ineffassign)
require.Equal(t, codersdk.TerminalFontName(""), initial.TerminalFont)

// when
Expand All @@ -2020,7 +2020,7 @@
require.Error(t, err)
})

t.Run("empty font is ok", func(t *testing.T) {
t.Run("undefined font is not ok", func(t *testing.T) {

Check failure on line 2023 in coderd/users_test.go

View workflow job for this annotation

GitHub Actions / lint 

Function TestUserTerminalFont missing the call to method parallel in the test run (paralleltest)
adminClient := coderdtest.New(t, nil)
firstUser := coderdtest.CreateFirstUser(t, adminClient)
client, _ := coderdtest.CreateAnotherUser(t, adminClient, firstUser.OrganizationID)
Expand All @@ -2029,18 +2029,17 @@
defer cancel()

// given
initial, err := client.GetUserAppearanceSettings(ctx, "me")

Check failure on line 2032 in coderd/users_test.go

View workflow job for this annotation

GitHub Actions / lint 

ineffectual assignment to err (ineffassign)
require.Equal(t, codersdk.TerminalFontName(""), initial.TerminalFont)

// when
updated, err := client.UpdateUserAppearanceSettings(ctx, "me", codersdk.UpdateUserAppearanceSettingsRequest{
_, err = client.UpdateUserAppearanceSettings(ctx, "me", codersdk.UpdateUserAppearanceSettingsRequest{
ThemePreference: "light",
TerminalFont: "",
})

// then
require.NoError(t, err)
require.Equal(t, codersdk.TerminalFontName(""), updated.TerminalFont)
require.Error(t, err)
})
}

Expand Down
Loading