diff --git a/repochecker/grammalecte/flags.go b/repochecker/grammalecte/flags.go index 20c6de38..c2b12c40 100644 --- a/repochecker/grammalecte/flags.go +++ b/repochecker/grammalecte/flags.go @@ -6,12 +6,13 @@ import ( "srs.epita.fr/fic-server/admin/sync" "srs.epita.fr/fic-server/libfic" + lib "srs.epita.fr/fic-server/repochecker/grammalecte/lib" ) func GrammalecteCheckKeyFlag(flag *fic.FlagKey, raw string, exceptions *sync.CheckExceptions) (errs []error) { label, _, _, _ := flag.AnalyzeFlagLabel() for _, err := range grammalecte("label ", label, exceptions, &CommonOpts) { - if e, ok := err.(GrammarError); ok && e.RuleId == "poncfin_règle1" { + if e, ok := err.(lib.GrammarError); ok && e.RuleId == "poncfin_règle1" { continue } @@ -56,7 +57,7 @@ func GrammalecteCheckMDText(str string, exceptions *sync.CheckExceptions) (errs return } -func GrammalecteCheckGrammar(data interface{}, exceptions *sync.CheckExceptions) (errs []error) { +func GrammalecteCheckGrammar(data interface{}, exceptions *sync.CheckExceptions) []error { if s, ok := data.(string); ok { return grammalecte("", s, exceptions, &CommonOpts) } else { diff --git a/repochecker/grammalecte/grammalecte.go b/repochecker/grammalecte/grammalecte.go index a9e0606f..596708ff 100644 --- a/repochecker/grammalecte/grammalecte.go +++ b/repochecker/grammalecte/grammalecte.go @@ -10,6 +10,7 @@ import ( "strings" "srs.epita.fr/fic-server/admin/sync" + lib "srs.epita.fr/fic-server/repochecker/grammalecte/lib" ) type GrammalecteOptions struct { @@ -169,7 +170,7 @@ func grammalecte(name string, text string, exceptions *sync.CheckExceptions, opt } suggestions, _ := suggest(serror.Value) - errs = append(errs, SpellingError{ + errs = append(errs, lib.SpellingError{ Prefix: name, Source: data.Text, NSource: data.Paragraph, @@ -190,7 +191,7 @@ func grammalecte(name string, text string, exceptions *sync.CheckExceptions, opt continue } - errs = append(errs, GrammarError{ + errs = append(errs, lib.GrammarError{ Prefix: name, Source: data.Text, NSource: data.Paragraph, diff --git a/repochecker/grammalecte/errors.go b/repochecker/grammalecte/lib/errors.go similarity index 98% rename from repochecker/grammalecte/errors.go rename to repochecker/grammalecte/lib/errors.go index bb4db743..8b5762ab 100644 --- a/repochecker/grammalecte/errors.go +++ b/repochecker/grammalecte/lib/errors.go @@ -1,4 +1,4 @@ -package main +package grammalecte import ( "bytes"