Unexport glamour color code function

This isn't really needed beyond this package, so unexporting it to avoid unintended use cases.

Author: andyfeller

pkg/x/markdown/accessibility.go

@@ -31,7 +31,7 @@ const (
 	brightWhite
 )
 
-func (a glamourStyleColor) Code() *string {
+func (a glamourStyleColor) code() *string {
 	s := strconv.Itoa(int(a))
 	return &s
 }
@@ -51,25 +51,25 @@ func accessibleDarkStyleConfig() ansi.StyleConfig {
 	cfg := styles.DarkStyleConfig
 
 	// Text color
-	cfg.Document.StylePrimitive.Color = white.Code()
+	cfg.Document.StylePrimitive.Color = white.code()
 
 	// Link colors
-	cfg.Link.Color = brightCyan.Code()
+	cfg.Link.Color = brightCyan.code()
 
 	// Heading colors
-	cfg.Heading.StylePrimitive.Color = brightMagenta.Code()
-	cfg.H1.StylePrimitive.Color = brightWhite.Code()
-	cfg.H1.StylePrimitive.BackgroundColor = brightBlue.Code()
+	cfg.Heading.StylePrimitive.Color = brightMagenta.code()
+	cfg.H1.StylePrimitive.Color = brightWhite.code()
+	cfg.H1.StylePrimitive.BackgroundColor = brightBlue.code()
 
 	// Code colors
-	cfg.Code.BackgroundColor = brightWhite.Code()
-	cfg.Code.Color = red.Code()
+	cfg.Code.BackgroundColor = brightWhite.code()
+	cfg.Code.Color = red.code()
 
 	// Image colors
-	cfg.Image.Color = brightMagenta.Code()
+	cfg.Image.Color = brightMagenta.code()
 
 	// Horizontal rule colors
-	cfg.HorizontalRule.Color = white.Code()
+	cfg.HorizontalRule.Color = white.code()
 
 	return cfg
 }
@@ -78,25 +78,25 @@ func accessibleLightStyleConfig() ansi.StyleConfig {
 	cfg := styles.LightStyleConfig
 
 	// Text color
-	cfg.Document.StylePrimitive.Color = black.Code()
+	cfg.Document.StylePrimitive.Color = black.code()
 
 	// Link colors
-	cfg.Link.Color = brightBlue.Code()
+	cfg.Link.Color = brightBlue.code()
 
 	// Heading colors
-	cfg.Heading.StylePrimitive.Color = magenta.Code()
-	cfg.H1.StylePrimitive.Color = brightWhite.Code()
-	cfg.H1.StylePrimitive.BackgroundColor = blue.Code()
+	cfg.Heading.StylePrimitive.Color = magenta.code()
+	cfg.H1.StylePrimitive.Color = brightWhite.code()
+	cfg.H1.StylePrimitive.BackgroundColor = blue.code()
 
 	// Code colors
-	cfg.Code.BackgroundColor = brightWhite.Code()
-	cfg.Code.Color = red.Code()
+	cfg.Code.BackgroundColor = brightWhite.code()
+	cfg.Code.Color = red.code()
 
 	// Image colors
-	cfg.Image.Color = magenta.Code()
+	cfg.Image.Color = magenta.code()
 
 	// Horizontal rule colors
-	cfg.HorizontalRule.Color = white.Code()
+	cfg.HorizontalRule.Color = white.code()
 
 	return cfg
 }

pkg/x/markdown/accessibility_test.go

@@ -98,7 +98,7 @@ func TestGlamourStyleColors(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			assert.Equal(t, tt.want, *tt.c.Code())
+			assert.Equal(t, tt.want, *tt.c.code())
 		})
 	}
 }
@@ -134,31 +134,31 @@ func TestAccessibleStyleConfig(t *testing.T) {
 
 func Test_accessibleDarkStyleConfig(t *testing.T) {
 	cfg := accessibleDarkStyleConfig()
-	assert.Equal(t, white.Code(), cfg.Document.StylePrimitive.Color)
-	assert.Equal(t, brightCyan.Code(), cfg.Link.Color)
-	assert.Equal(t, brightMagenta.Code(), cfg.Heading.StylePrimitive.Color)
-	assert.Equal(t, brightWhite.Code(), cfg.H1.StylePrimitive.Color)
-	assert.Equal(t, brightBlue.Code(), cfg.H1.StylePrimitive.BackgroundColor)
-	assert.Equal(t, brightWhite.Code(), cfg.Code.BackgroundColor)
-	assert.Equal(t, red.Code(), cfg.Code.Color)
-	assert.Equal(t, brightMagenta.Code(), cfg.Image.Color)
-	assert.Equal(t, white.Code(), cfg.HorizontalRule.Color)
+	assert.Equal(t, white.code(), cfg.Document.StylePrimitive.Color)
+	assert.Equal(t, brightCyan.code(), cfg.Link.Color)
+	assert.Equal(t, brightMagenta.code(), cfg.Heading.StylePrimitive.Color)
+	assert.Equal(t, brightWhite.code(), cfg.H1.StylePrimitive.Color)
+	assert.Equal(t, brightBlue.code(), cfg.H1.StylePrimitive.BackgroundColor)
+	assert.Equal(t, brightWhite.code(), cfg.Code.BackgroundColor)
+	assert.Equal(t, red.code(), cfg.Code.Color)
+	assert.Equal(t, brightMagenta.code(), cfg.Image.Color)
+	assert.Equal(t, white.code(), cfg.HorizontalRule.Color)
 
 	// Test that we haven't changed the original style
 	assert.Equal(t, styles.DarkStyleConfig.H2, cfg.H2)
 }
 
 func Test_accessibleLightStyleConfig(t *testing.T) {
 	cfg := accessibleLightStyleConfig()
-	assert.Equal(t, black.Code(), cfg.Document.StylePrimitive.Color)
-	assert.Equal(t, brightBlue.Code(), cfg.Link.Color)
-	assert.Equal(t, magenta.Code(), cfg.Heading.StylePrimitive.Color)
-	assert.Equal(t, brightWhite.Code(), cfg.H1.StylePrimitive.Color)
-	assert.Equal(t, blue.Code(), cfg.H1.StylePrimitive.BackgroundColor)
-	assert.Equal(t, brightWhite.Code(), cfg.Code.BackgroundColor)
-	assert.Equal(t, red.Code(), cfg.Code.Color)
-	assert.Equal(t, magenta.Code(), cfg.Image.Color)
-	assert.Equal(t, white.Code(), cfg.HorizontalRule.Color)
+	assert.Equal(t, black.code(), cfg.Document.StylePrimitive.Color)
+	assert.Equal(t, brightBlue.code(), cfg.Link.Color)
+	assert.Equal(t, magenta.code(), cfg.Heading.StylePrimitive.Color)
+	assert.Equal(t, brightWhite.code(), cfg.H1.StylePrimitive.Color)
+	assert.Equal(t, blue.code(), cfg.H1.StylePrimitive.BackgroundColor)
+	assert.Equal(t, brightWhite.code(), cfg.Code.BackgroundColor)
+	assert.Equal(t, red.code(), cfg.Code.Color)
+	assert.Equal(t, magenta.code(), cfg.Image.Color)
+	assert.Equal(t, white.code(), cfg.HorizontalRule.Color)
 
 	// Test that we haven't changed the original style
 	assert.Equal(t, styles.LightStyleConfig.H2, cfg.H2)