CodeblockContext method renames

Fixes #9577

4 files changed, 11 insertions, 11 deletions

diff --git a/markup/converter/hooks/hooks.go b/markup/converter/hooks/hooks.go
index e81689f04..54ebf405e 100644
--- a/markup/converter/hooks/hooks.go
+++ b/markup/converter/hooks/hooks.go
@@ -40,8 +40,8 @@ type CodeblockContext interface {
 	AttributesProvider
 	text.Positioner
 	Options() map[string]interface{}
-	Lang() string
-	Code() string
+	Type() string
+	Inner() string
 	Ordinal() int
 	Page() interface{}
 }
diff --git a/markup/goldmark/codeblocks/integration_test.go b/markup/goldmark/codeblocks/integration_test.go
index 001deb9f8..fcd406c2c 100644
--- a/markup/goldmark/codeblocks/integration_test.go
+++ b/markup/goldmark/codeblocks/integration_test.go
@@ -40,12 +40,12 @@ func TestCodeblocks(t *testing.T) {
     style = 'monokai'
     tabWidth = 4
 -- layouts/_default/_markup/render-codeblock-goat.html --
-{{ $diagram := diagrams.Goat .Code }}
+{{ $diagram := diagrams.Goat .Inner }}
 Goat SVG:{{ substr $diagram.SVG 0 100 | safeHTML }}  }}|
 Goat Attribute: {{ .Attributes.width}}|
 -- layouts/_default/_markup/render-codeblock-go.html --
-Go Code: {{ .Code | safeHTML }}|
-Go Language: {{ .Lang }}|
+Go Code: {{ .Inner | safeHTML }}|
+Go Language: {{ .Type }}|
 -- layouts/_default/single.html --
 {{ .Content }}
 -- content/p1.md --
@@ -129,7 +129,7 @@ echo "p1";
 -- layouts/_default/single.html --
 {{ .Content }}
 -- layouts/_default/_markup/render-codeblock.html --
-|{{ .Code | safeHTML }}|
+|{{ .Inner | safeHTML }}|
 
 `
 
diff --git a/markup/goldmark/codeblocks/render.go b/markup/goldmark/codeblocks/render.go
index 27252fc27..97604eb55 100644
--- a/markup/goldmark/codeblocks/render.go
+++ b/markup/goldmark/codeblocks/render.go
@@ -150,11 +150,11 @@ func (c *codeBlockContext) Page() interface{} {
 	return c.page
 }
 
-func (c *codeBlockContext) Lang() string {
+func (c *codeBlockContext) Type() string {
 	return c.lang
 }
 
-func (c *codeBlockContext) Code() string {
+func (c *codeBlockContext) Inner() string {
 	return c.code
 }
 
diff --git a/markup/highlight/highlight.go b/markup/highlight/highlight.go
index dac45e312..c04fbad31 100644
--- a/markup/highlight/highlight.go
+++ b/markup/highlight/highlight.go
@@ -103,7 +103,7 @@ func (h chromaHighlighter) HighlightCodeBlock(ctx hooks.CodeblockContext, opts i
 		return HightlightResult{}, err
 	}
 
-	err := highlight(&b, ctx.Code(), ctx.Lang(), attributes, cfg)
+	err := highlight(&b, ctx.Inner(), ctx.Type(), attributes, cfg)
 	if err != nil {
 		return HightlightResult{}, err
 	}
@@ -125,9 +125,9 @@ func (h chromaHighlighter) RenderCodeblock(w hugio.FlexiWriter, ctx hooks.Codebl
 		return err
 	}
 
-	code := text.Puts(ctx.Code())
+	code := text.Puts(ctx.Inner())
 
-	return highlight(w, code, ctx.Lang(), attributes, cfg)
+	return highlight(w, code, ctx.Type(), attributes, cfg)
 }
 
 func (h chromaHighlighter) IsDefaultCodeBlockRenderer() bool {