Remove rest of the now unused emoji code

See #11598
gohugoio · Oct 26, 2023 · c4a530f · c4a530f
1 parent 272484f
commit c4a530f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 31 deletions.
diff --git a/hugolib/page.go b/hugolib/page.go
@@ -631,7 +631,6 @@ func (p *pageState) wrapError(err error) error {
 	}
 
 	return herrors.NewFileErrorFromFile(err, filename, p.s.SourceSpec.Fs.Source, lineMatcher)
-
 }
 
 func (p *pageState) getContentConverter() converter.Converter {
@@ -674,7 +673,6 @@ func (p *pageState) mapContentForResult(
 	markup string,
 	withFrontMatter func(map[string]any) error,
 ) error {
-
 	iter := result.Iterator()
 
 	fail := func(err error, i pageparser.Item) error {
@@ -792,9 +790,6 @@ Loop:
 			s.shortcodes = append(s.shortcodes, currShortcode)
 
 			rn.AddShortcode(currShortcode)
-
-		case it.Type == pageparser.TypeEmoji:
-			rn.AddBytes(it)
 		case it.IsEOF():
 			break Loop
 		case it.IsError():

diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go
@@ -16,6 +16,7 @@ package hugolib
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"html/template"
 	"path"
@@ -26,8 +27,6 @@ import (
 	"strings"
 	"sync"
 
-	"errors"
-
 	"github.com/gohugoio/hugo/common/herrors"
 
 	"github.com/gohugoio/hugo/parser/pageparser"
@@ -312,8 +311,8 @@ func prepareShortcode(
 	tplVariants tpl.TemplateVariants,
 	sc *shortcode,
 	parent *ShortcodeWithPage,
-	p *pageState) (shortcodeRenderer, error) {
-
+	p *pageState,
+) (shortcodeRenderer, error) {
 	toParseErr := func(err error) error {
 		return p.parseError(fmt.Errorf("failed to render shortcode %q: %w", sc.name, err), p.source.parsed.Input(), sc.pos)
 	}
@@ -332,7 +331,6 @@ func prepareShortcode(
 	}
 
 	return fn, nil
-
 }
 
 func doRenderShortcode(
@@ -342,7 +340,8 @@ func doRenderShortcode(
 	tplVariants tpl.TemplateVariants,
 	sc *shortcode,
 	parent *ShortcodeWithPage,
-	p *pageState) (shortcodeRenderer, error) {
+	p *pageState,
+) (shortcodeRenderer, error) {
 	var tmpl tpl.Template
 
 	// Tracks whether this shortcode or any of its children has template variations
@@ -501,7 +500,6 @@ func (s *shortcodeHandler) transferNames(in *shortcodeHandler) {
 	for k := range in.nameSet {
 		s.nameSet[k] = true
 	}
-
 }
 
 func (s *shortcodeHandler) hasName(name string) bool {
@@ -629,8 +627,6 @@ Loop:
 			return sc, nil
 		case currItem.IsText():
 			sc.inner = append(sc.inner, currItem.ValStr(source))
-		case currItem.Type == pageparser.TypeEmoji:
-			sc.inner = append(sc.inner, currItem.ValStr(source))
 		case currItem.IsShortcodeName():
 
 			sc.name = currItem.ValStr(source)

diff --git a/parser/pageparser/item.go b/parser/pageparser/item.go
@@ -192,7 +192,6 @@ const (
 	TypeFrontMatterTOML
 	TypeFrontMatterJSON
 	TypeFrontMatterORG
-	TypeEmoji
 	TypeIgnore // // The BOM Unicode byte order marker and possibly others
 
 	// shortcode items

diff --git a/parser/pageparser/itemtype_string.go b/parser/pageparser/itemtype_string.go