diff options
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/context/repo.go | 2 | ||||
| -rw-r--r-- | internal/route/api/v1/repo/file.go | 6 | ||||
| -rw-r--r-- | internal/template/template.go | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/internal/context/repo.go b/internal/context/repo.go index dc0fcfee..587005c2 100644 --- a/internal/context/repo.go +++ b/internal/context/repo.go @@ -9,7 +9,7 @@ import ( "io/ioutil" "strings" - "gopkg.in/editorconfig/editorconfig-core-go.v1" + "github.com/editorconfig/editorconfig-core-go/v2" "gopkg.in/macaron.v1" "github.com/gogs/git-module" diff --git a/internal/route/api/v1/repo/file.go b/internal/route/api/v1/repo/file.go index 47907af7..6b1cf470 100644 --- a/internal/route/api/v1/repo/file.go +++ b/internal/route/api/v1/repo/file.go @@ -53,7 +53,11 @@ func GetEditorconfig(c *context.APIContext) { } fileName := c.Params("filename") - def := ec.GetDefinitionForFilename(fileName) + def, err := ec.GetDefinitionForFilename(fileName) + if err != nil { + c.ServerError("GetDefinitionForFilename", err) + return + } if def == nil { c.NotFound() return diff --git a/internal/template/template.go b/internal/template/template.go index abbf416e..bbe0d2a0 100644 --- a/internal/template/template.go +++ b/internal/template/template.go @@ -14,12 +14,12 @@ import ( "strings" "time" + "github.com/editorconfig/editorconfig-core-go/v2" jsoniter "github.com/json-iterator/go" "github.com/microcosm-cc/bluemonday" "golang.org/x/net/html/charset" "golang.org/x/text/transform" log "gopkg.in/clog.v1" - "gopkg.in/editorconfig/editorconfig-core-go.v1" "gogs.io/gogs/internal/db" "gogs.io/gogs/internal/markup" @@ -116,8 +116,8 @@ func NewFuncMap() []template.FuncMap { }, "TabSizeClass": func(ec *editorconfig.Editorconfig, filename string) string { if ec != nil { - def := ec.GetDefinitionForFilename(filename) - if def.TabWidth > 0 { + def, err := ec.GetDefinitionForFilename(filename) + if err == nil && def.TabWidth > 0 { return fmt.Sprintf("tab-size-%d", def.TabWidth) } } |