all: Fix typos in function names and comments

This commit is contained in:
Oleksandr Redko 2023-05-22 20:11:12 +03:00 committed by Bjørn Erik Pedersen
parent 12dc9a6e4a
commit 9009c8cdca
27 changed files with 41 additions and 41 deletions

2
cache/docs.go vendored
View file

@ -1,2 +1,2 @@
// Package cache contains the differenct cache implementations. // Package cache contains the different cache implementations.
package cache package cache

View file

@ -81,7 +81,7 @@ type FileCacheConfig struct {
// Max age of cache entries in this cache. Any items older than this will // Max age of cache entries in this cache. Any items older than this will
// be removed and not returned from the cache. // be removed and not returned from the cache.
// A negative value means forever, 0 means cache is disabled. // A negative value means forever, 0 means cache is disabled.
// Hugo is leninent with what types it accepts here, but we recommend using // Hugo is lenient with what types it accepts here, but we recommend using
// a duration string, a sequence of decimal numbers, each with optional fraction and a unit suffix, // a duration string, a sequence of decimal numbers, each with optional fraction and a unit suffix,
// such as "300ms", "1.5h" or "2h45m". // such as "300ms", "1.5h" or "2h45m".
// Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". // Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".

View file

@ -238,11 +238,11 @@ func (r *rootCommand) ConfigFromProvider(key int32, cfg config.Provider) (*commo
renderStaticToDisk := cfg.GetBool("renderStaticToDisk") renderStaticToDisk := cfg.GetBool("renderStaticToDisk")
sourceFs := hugofs.Os sourceFs := hugofs.Os
var desinationFs afero.Fs var destinationFs afero.Fs
if cfg.GetBool("renderToDisk") { if cfg.GetBool("renderToDisk") {
desinationFs = hugofs.Os destinationFs = hugofs.Os
} else { } else {
desinationFs = afero.NewMemMapFs() destinationFs = afero.NewMemMapFs()
if renderStaticToDisk { if renderStaticToDisk {
// Hybrid, render dynamic content to Root. // Hybrid, render dynamic content to Root.
cfg.Set("publishDirDynamic", "/") cfg.Set("publishDirDynamic", "/")
@ -253,7 +253,7 @@ func (r *rootCommand) ConfigFromProvider(key int32, cfg config.Provider) (*commo
} }
} }
fs := hugofs.NewFromSourceAndDestination(sourceFs, desinationFs, cfg) fs := hugofs.NewFromSourceAndDestination(sourceFs, destinationFs, cfg)
if renderStaticToDisk { if renderStaticToDisk {
dynamicFs := fs.PublishDir dynamicFs := fs.PublishDir

View file

@ -84,7 +84,7 @@ type convertCommand struct {
r *rootCommand r *rootCommand
h *hugolib.HugoSites h *hugolib.HugoSites
// Commmands. // Commands.
commands []simplecobra.Commander commands []simplecobra.Commander
} }

View file

@ -33,7 +33,7 @@ type LineMatcher struct {
} }
// LineMatcherFn is used to match a line with an error. // LineMatcherFn is used to match a line with an error.
// It returns the column number or 0 if the line was found, but column could not be determinde. Returns -1 if no line match. // It returns the column number or 0 if the line was found, but column could not be determined. Returns -1 if no line match.
type LineMatcherFn func(m LineMatcher) int type LineMatcherFn func(m LineMatcher) int
// SimpleLineMatcher simply matches by line number. // SimpleLineMatcher simply matches by line number.

View file

@ -297,7 +297,7 @@ func extractFileTypePos(err error) (string, text.Position) {
} }
// The error type from the minifier contains line number and column number. // The error type from the minifier contains line number and column number.
if line, col := exctractLineNumberAndColumnNumber(err); line >= 0 { if line, col := extractLineNumberAndColumnNumber(err); line >= 0 {
pos.LineNumber = line pos.LineNumber = line
pos.ColumnNumber = col pos.ColumnNumber = col
return fileType, pos return fileType, pos
@ -369,7 +369,7 @@ func extractOffsetAndType(e error) (int, string) {
} }
} }
func exctractLineNumberAndColumnNumber(e error) (int, int) { func extractLineNumberAndColumnNumber(e error) (int, int) {
switch v := e.(type) { switch v := e.(type) {
case *parse.Error: case *parse.Error:
return v.Line, v.Column return v.Line, v.Column

View file

@ -118,7 +118,7 @@ func SafeCommand(name string, arg ...string) (*exec.Cmd, error) {
return exec.Command(bin, arg...), nil return exec.Command(bin, arg...), nil
} }
// Exec encorces a security policy for commands run via os/exec. // Exec enforces a security policy for commands run via os/exec.
type Exec struct { type Exec struct {
sc security.Config sc security.Config

View file

@ -209,7 +209,7 @@ func extractFilename(in, ext, base, pathSeparator string) (name string) {
// return the filename minus the extension (and the ".") // return the filename minus the extension (and the ".")
name = base[:strings.LastIndex(base, ".")] name = base[:strings.LastIndex(base, ".")]
} else { } else {
// no extension case so just return base, which willi // no extension case so just return base, which will
// be the filename // be the filename
name = base name = base
} }

View file

@ -424,10 +424,10 @@ type RootConfig struct {
// Copyright information. // Copyright information.
Copyright string Copyright string
// The language to apply to content without any Clolanguage indicator. // The language to apply to content without any language indicator.
DefaultContentLanguage string DefaultContentLanguage string
// By defefault, we put the default content language in the root and the others below their language ID, e.g. /no/. // By default, we put the default content language in the root and the others below their language ID, e.g. /no/.
// Set this to true to put all languages below their language ID. // Set this to true to put all languages below their language ID.
DefaultContentLanguageInSubdir bool DefaultContentLanguageInSubdir bool

View file

@ -97,7 +97,7 @@ var defaultBuild = BuildConfig{
Source: `(postcss|tailwind)\.config\.js`, Source: `(postcss|tailwind)\.config\.js`,
Target: cssTargetCachebusterRe, Target: cssTargetCachebusterRe,
}, },
// This is deliberatly coarse grained; it will cache bust resources with "json" in the cache key when js files changes, which is good. // This is deliberately coarse grained; it will cache bust resources with "json" in the cache key when js files changes, which is good.
{ {
Source: `assets/.*\.(.*)$`, Source: `assets/.*\.(.*)$`,
Target: `$1`, Target: `$1`,
@ -113,7 +113,7 @@ type BuildConfig struct {
// related aggregated data (e.g. CSS class names). // related aggregated data (e.g. CSS class names).
WriteStats bool WriteStats bool
// Can be used to toggle off writing of the intellinsense /assets/jsconfig.js // Can be used to toggle off writing of the IntelliSense /assets/jsconfig.js
// file. // file.
NoJSConfigInAssets bool NoJSConfigInAssets bool

View file

@ -30,7 +30,7 @@ var (
emojiMaxSize int emojiMaxSize int
) )
// Emoji returns the emojy given a key, e.g. ":smile:", nil if not found. // Emoji returns the emoji given a key, e.g. ":smile:", nil if not found.
func Emoji(key string) []byte { func Emoji(key string) []byte {
emojiInit.Do(initEmoji) emojiInit.Do(initEmoji)
return emojis[key] return emojis[key]

View file

@ -41,7 +41,7 @@ func TestEmojiCustom(t *testing.T) {
{" :beer: :", []byte(" 🍺 :")}, {" :beer: :", []byte(" 🍺 :")},
{":beer: and :smile: and another :beer:!", []byte("🍺 and 😄 and another 🍺!")}, {":beer: and :smile: and another :beer:!", []byte("🍺 and 😄 and another 🍺!")},
{" :beer: : ", []byte(" 🍺 : ")}, {" :beer: : ", []byte(" 🍺 : ")},
{"No smilies for you!", []byte("No smilies for you!")}, {"No smiles for you!", []byte("No smiles for you!")},
{" The motto: no smiles! ", []byte(" The motto: no smiles! ")}, {" The motto: no smiles! ", []byte(" The motto: no smiles! ")},
{":hugo_is_the_best_static_gen:", []byte(":hugo_is_the_best_static_gen:")}, {":hugo_is_the_best_static_gen:", []byte(":hugo_is_the_best_static_gen:")},
{"은행 :smile: 은행", []byte("은행 😄 은행")}, {"은행 :smile: 은행", []byte("은행 😄 은행")},

View file

@ -38,7 +38,7 @@ func init() {
} }
// CreateTempDir creates a temp dir in the given filesystem and // CreateTempDir creates a temp dir in the given filesystem and
// returns the dirnam and a func that removes it when done. // returns the dirname and a func that removes it when done.
func CreateTempDir(fs afero.Fs, prefix string) (string, func(), error) { func CreateTempDir(fs afero.Fs, prefix string) (string, func(), error) {
tempDir, err := afero.TempDir(fs, "", prefix) tempDir, err := afero.TempDir(fs, "", prefix)
if err != nil { if err != nil {

View file

@ -92,7 +92,7 @@ func NewLanguageFs(langs map[string]int, fs afero.Fs) (afero.Fs, error) {
fim := fi.(FileMetaInfo) fim := fi.(FileMetaInfo)
langs := translations[fim.Meta().TranslationBaseNameWithExt] langs := translations[fim.Meta().TranslationBaseNameWithExt]
if len(langs) > 0 { if len(langs) > 0 {
fim.Meta().Translations = sortAndremoveStringDuplicates(langs) fim.Meta().Translations = sortAndRemoveStringDuplicates(langs)
} }
} }
} }
@ -328,7 +328,7 @@ func printFs(fs afero.Fs, path string, w io.Writer) {
}) })
} }
func sortAndremoveStringDuplicates(s []string) []string { func sortAndRemoveStringDuplicates(s []string) []string {
ss := sort.StringSlice(s) ss := sort.StringSlice(s)
ss.Sort() ss.Sort()
i := 0 i := 0

View file

@ -175,7 +175,7 @@ func MakeReadableAndRemoveAllModulePkgDir(fs afero.Fs, dir string) (int, error)
} }
// IsOsFs returns whether fs is an OsFs or if it fs wraps an OsFs. // IsOsFs returns whether fs is an OsFs or if it fs wraps an OsFs.
// TODO(bep) make this nore robust. // TODO(bep) make this more robust.
func IsOsFs(fs afero.Fs) bool { func IsOsFs(fs afero.Fs) bool {
var isOsFs bool var isOsFs bool
WalkFilesystems(fs, func(fs afero.Fs) bool { WalkFilesystems(fs, func(fs afero.Fs) bool {

View file

@ -59,11 +59,11 @@ func TestFilenameFilter(t *testing.T) {
c.Assert(includeOnlyFilter.Match("ab.jpg", false), qt.Equals, true) c.Assert(includeOnlyFilter.Match("ab.jpg", false), qt.Equals, true)
c.Assert(includeOnlyFilter.Match("ab.gif", false), qt.Equals, false) c.Assert(includeOnlyFilter.Match("ab.gif", false), qt.Equals, false)
exlcudeOnlyFilter, err := NewFilenameFilter(nil, []string{"**.json", "**.jpg"}) excludeOnlyFilter, err := NewFilenameFilter(nil, []string{"**.json", "**.jpg"})
c.Assert(err, qt.IsNil) c.Assert(err, qt.IsNil)
c.Assert(exlcudeOnlyFilter.Match("ab.json", false), qt.Equals, false) c.Assert(excludeOnlyFilter.Match("ab.json", false), qt.Equals, false)
c.Assert(exlcudeOnlyFilter.Match("ab.jpg", false), qt.Equals, false) c.Assert(excludeOnlyFilter.Match("ab.jpg", false), qt.Equals, false)
c.Assert(exlcudeOnlyFilter.Match("ab.gif", false), qt.Equals, true) c.Assert(excludeOnlyFilter.Match("ab.gif", false), qt.Equals, true)
var nilFilter *FilenameFilter var nilFilter *FilenameFilter
c.Assert(nilFilter.Match("ab.gif", false), qt.Equals, true) c.Assert(nilFilter.Match("ab.gif", false), qt.Equals, true)

View file

@ -35,7 +35,7 @@ func TestLoadConfigLanguageParamsOverrideIssue10620(t *testing.T) {
files := ` files := `
-- hugo.toml -- -- hugo.toml --
baseURL = "https://example.com" baseURL = "https://example.com"
disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "setion"] disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "section"]
title = "Base Title" title = "Base Title"
staticDir = "mystatic" staticDir = "mystatic"
[params] [params]
@ -79,7 +79,7 @@ func TestLoadConfig(t *testing.T) {
files := ` files := `
-- hugo.toml -- -- hugo.toml --
baseURL = "https://example.com" baseURL = "https://example.com"
disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "setion"] disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "section"]
title = "Base Title" title = "Base Title"
staticDir = "mystatic" staticDir = "mystatic"
[params] [params]
@ -131,7 +131,7 @@ myparam = "svParamValue"
files := ` files := `
-- hugo.toml -- -- hugo.toml --
baseURL = "https://example.com" baseURL = "https://example.com"
disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "setion"] disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "section"]
title = "Base Title" title = "Base Title"
defaultContentLanguage = "sv" defaultContentLanguage = "sv"
disableLanguages = ["sv"] disableLanguages = ["sv"]
@ -178,7 +178,7 @@ running = true
files := ` files := `
-- hugo.toml -- -- hugo.toml --
baseURL = "https://example.com" baseURL = "https://example.com"
disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "setion"] disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "section"]
title = "Base Title" title = "Base Title"
[params] [params]
p1 = "p1base" p1 = "p1base"

View file

@ -30,7 +30,7 @@ b = "bc1"
-- hugo.toml -- -- hugo.toml --
baseURL = "https://example.com" baseURL = "https://example.com"
disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "setion"] disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "section"]
ignoreErrors = ["error-missing-instagram-accesstoken"] ignoreErrors = ["error-missing-instagram-accesstoken"]
[params] [params]
a = "a1" a = "a1"

View file

@ -25,7 +25,7 @@ func TestData(t *testing.T) {
files := ` files := `
-- hugo.toml -- -- hugo.toml --
baseURL = "https://example.com" baseURL = "https://example.com"
disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "setion"] disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "section"]
theme = "mytheme" theme = "mytheme"
-- data/a.toml -- -- data/a.toml --
v1 = "a_v1" v1 = "a_v1"

View file

@ -30,7 +30,7 @@ func TestEmbeddedShortcodes(t *testing.T) {
files := ` files := `
-- hugo.toml -- -- hugo.toml --
baseURL = "https://example.com" baseURL = "https://example.com"
disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "setion"] disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "section"]
ignoreErrors = ["error-missing-instagram-accesstoken"] ignoreErrors = ["error-missing-instagram-accesstoken"]
[params] [params]
foo = "bar" foo = "bar"

View file

@ -326,7 +326,7 @@ func (h *HugoSites) postProcess(l logg.LevelLogger) error {
// This will only be set when js.Build have been triggered with // This will only be set when js.Build have been triggered with
// imports that resolves to the project or a module. // imports that resolves to the project or a module.
// Write a jsconfig.json file to the project's /asset directory // Write a jsconfig.json file to the project's /asset directory
// to help JS intellisense in VS Code etc. // to help JS IntelliSense in VS Code etc.
if !h.ResourceSpec.BuildConfig().NoJSConfigInAssets && h.BaseFs.Assets.Dirs != nil { if !h.ResourceSpec.BuildConfig().NoJSConfigInAssets && h.BaseFs.Assets.Dirs != nil {
fi, err := h.BaseFs.Assets.Fs.Stat("") fi, err := h.BaseFs.Assets.Fs.Stat("")
if err != nil { if err != nil {

View file

@ -235,7 +235,7 @@ func TestGetPage(t *testing.T) {
{"Root relative, no slash, root page", page.KindPage, nil, []string{"about.md", "ABOUT.md"}, "about page"}, {"Root relative, no slash, root page", page.KindPage, nil, []string{"about.md", "ABOUT.md"}, "about page"},
{"Root relative, no slash, section", page.KindSection, nil, []string{"sect3"}, "section 3"}, {"Root relative, no slash, section", page.KindSection, nil, []string{"sect3"}, "section 3"},
{"Root relative, no slash, section page", page.KindPage, nil, []string{"sect3/page1.md"}, "Title3_1"}, {"Root relative, no slash, section page", page.KindPage, nil, []string{"sect3/page1.md"}, "Title3_1"},
{"Root relative, no slash, sub setion", page.KindSection, nil, []string{"sect3/sect7"}, "another sect7"}, {"Root relative, no slash, sub section", page.KindSection, nil, []string{"sect3/sect7"}, "another sect7"},
{"Root relative, no slash, nested page", page.KindPage, nil, []string{"sect3/subsect/deep.md"}, "deep page"}, {"Root relative, no slash, nested page", page.KindPage, nil, []string{"sect3/subsect/deep.md"}, "deep page"},
{"Root relative, no slash, OS slashes", page.KindPage, nil, []string{filepath.FromSlash("sect5/page3.md")}, "Title5_3"}, {"Root relative, no slash, OS slashes", page.KindPage, nil, []string{filepath.FromSlash("sect5/page3.md")}, "Title5_3"},
@ -247,7 +247,7 @@ func TestGetPage(t *testing.T) {
// content root relative paths without a leading slash, the lookup // content root relative paths without a leading slash, the lookup
// returns /sect7. This undermines ambiguity detection, but we have no choice. // returns /sect7. This undermines ambiguity detection, but we have no choice.
//{"Ambiguous", nil, []string{"sect7"}, ""}, //{"Ambiguous", nil, []string{"sect7"}, ""},
{"Section, ambigous", page.KindSection, nil, []string{"sect7"}, "Sect7s"}, {"Section, ambiguous", page.KindSection, nil, []string{"sect7"}, "Sect7s"},
{"Absolute, home", page.KindHome, nil, []string{"/", ""}, "home page"}, {"Absolute, home", page.KindHome, nil, []string{"/", ""}, "home page"},
{"Absolute, page", page.KindPage, nil, []string{"/about.md", "/about"}, "about page"}, {"Absolute, page", page.KindPage, nil, []string{"/about.md", "/about"}, "about page"},

View file

@ -885,7 +885,7 @@ func (s *Site) getLanguageTargetPathLang(alwaysInSubDir bool) string {
return s.getLanguagePermalinkLang(alwaysInSubDir) return s.getLanguagePermalinkLang(alwaysInSubDir)
} }
// get any lanaguagecode to prefix the relative permalink with. // get any language code to prefix the relative permalink with.
func (s *Site) getLanguagePermalinkLang(alwaysInSubDir bool) string { func (s *Site) getLanguagePermalinkLang(alwaysInSubDir bool) string {
if !s.h.isMultiLingual() || s.h.Conf.IsMultihost() { if !s.h.isMultiLingual() || s.h.Conf.IsMultihost() {
return "" return ""

View file

@ -92,7 +92,7 @@ func NewLanguage(lang, defaultContentLanguage, timeZone string, languageConfig L
return l, l.loadLocation(timeZone) return l, l.loadLocation(timeZone)
} }
// This is injected from hugolib to avoid cirular dependencies. // This is injected from hugolib to avoid circular dependencies.
var DeprecationFunc = func(item, alternative string, err bool) {} var DeprecationFunc = func(item, alternative string, err bool) {}
const paramsDeprecationWarning = `.Language.Params is deprecated and will be removed in a future release. Use site.Params instead. const paramsDeprecationWarning = `.Language.Params is deprecated and will be removed in a future release. Use site.Params instead.

View file

@ -143,7 +143,7 @@ func refreshPathForPort(s string, port int) {
wsHub.broadcast <- []byte(msg) wsHub.broadcast <- []byte(msg)
} }
// ServeJS serves the liverreload.js who's reference is injected into the page. // ServeJS serves the livereload.js who's reference is injected into the page.
func ServeJS(w http.ResponseWriter, r *http.Request) { func ServeJS(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", media.Builtin.JavascriptType.Type) w.Header().Set("Content-Type", media.Builtin.JavascriptType.Type)
w.Write(liveReloadJS()) w.Write(liveReloadJS())

View file

@ -20,7 +20,7 @@ import (
) )
// Builder builds a jsconfig.json file that, currently, is used only to assist // Builder builds a jsconfig.json file that, currently, is used only to assist
// intellinsense in editors. // IntelliSense in editors.
type Builder struct { type Builder struct {
sourceRootsMu sync.RWMutex sourceRootsMu sync.RWMutex
sourceRoots map[string]bool sourceRoots map[string]bool

View file

@ -239,7 +239,7 @@ func createBuildPlugins(c *Client, opts Options) ([]api.Plugin, error) {
if m != nil { if m != nil {
// Store the source root so we can create a jsconfig.json // Store the source root so we can create a jsconfig.json
// to help intellisense when the build is done. // to help IntelliSense when the build is done.
// This should be a small number of elements, and when // This should be a small number of elements, and when
// in server mode, we may get stale entries on renames etc., // in server mode, we may get stale entries on renames etc.,
// but that shouldn't matter too much. // but that shouldn't matter too much.