Remove rest of the now unused emoji code

See #11598

diff --git a/hugolib/page.go b/hugolib/page.go
index 48f4c9d2b6ed2b7ab2652518117df5c7097d1709..2ea936af211d5bb81fa4b9ba416f7a27ca0d9abb 100644 (file)
--- 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
index 8edfab118f8da184c77a4ca756420d470c22476c..c10896beffba0fb34adf7967a88ca564b14535a3 100644 (file)
--- 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
index d4dcc2785e96ef9a4456c49b231dee58e3c7f858..47ec6d64dbb77bce2ebc4512daf3c245d1a41fd6 100644 (file)
--- 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
index b0b849adecf29b5c5dc664f1daf063d3e9e5a092..92a87b6122f2ade8d199a17ab680ad06d5fae6c4 100644 (file)
--- a/parser/pageparser/itemtype_string.go
+++ b/parser/pageparser/itemtype_string.go
@@ -15,25 +15,24 @@ func _() {
        _ = x[TypeFrontMatterTOML-4]
        _ = x[TypeFrontMatterJSON-5]
        _ = x[TypeFrontMatterORG-6]
-       _ = x[TypeEmoji-7]
-       _ = x[TypeIgnore-8]
-       _ = x[tLeftDelimScNoMarkup-9]
-       _ = x[tRightDelimScNoMarkup-10]
-       _ = x[tLeftDelimScWithMarkup-11]
-       _ = x[tRightDelimScWithMarkup-12]
-       _ = x[tScClose-13]
-       _ = x[tScName-14]
-       _ = x[tScNameInline-15]
-       _ = x[tScParam-16]
-       _ = x[tScParamVal-17]
-       _ = x[tIndentation-18]
-       _ = x[tText-19]
-       _ = x[tKeywordMarker-20]
+       _ = x[TypeIgnore-7]
+       _ = x[tLeftDelimScNoMarkup-8]
+       _ = x[tRightDelimScNoMarkup-9]
+       _ = x[tLeftDelimScWithMarkup-10]
+       _ = x[tRightDelimScWithMarkup-11]
+       _ = x[tScClose-12]
+       _ = x[tScName-13]
+       _ = x[tScNameInline-14]
+       _ = x[tScParam-15]
+       _ = x[tScParamVal-16]
+       _ = x[tIndentation-17]
+       _ = x[tText-18]
+       _ = x[tKeywordMarker-19]
 }
 
-const _ItemType_name = "tErrortEOFTypeLeadSummaryDividerTypeFrontMatterYAMLTypeFrontMatterTOMLTypeFrontMatterJSONTypeFrontMatterORGTypeEmojiTypeIgnoretLeftDelimScNoMarkuptRightDelimScNoMarkuptLeftDelimScWithMarkuptRightDelimScWithMarkuptScClosetScNametScNameInlinetScParamtScParamValtIndentationtTexttKeywordMarker"
+const _ItemType_name = "tErrortEOFTypeLeadSummaryDividerTypeFrontMatterYAMLTypeFrontMatterTOMLTypeFrontMatterJSONTypeFrontMatterORGTypeIgnoretLeftDelimScNoMarkuptRightDelimScNoMarkuptLeftDelimScWithMarkuptRightDelimScWithMarkuptScClosetScNametScNameInlinetScParamtScParamValtIndentationtTexttKeywordMarker"
 
-var _ItemType_index = [...]uint16{0, 6, 10, 32, 51, 70, 89, 107, 116, 126, 146, 167, 189, 212, 220, 227, 240, 248, 259, 271, 276, 290}
+var _ItemType_index = [...]uint16{0, 6, 10, 32, 51, 70, 89, 107, 117, 137, 158, 180, 203, 211, 218, 231, 239, 250, 262, 267, 281}
 
 func (i ItemType) String() string {
        if i < 0 || i >= ItemType(len(_ItemType_index)-1) {