aboutsummaryrefslogtreecommitdiffstats
path: root/routers/web/repo/editor.go
diff options
context:
space:
mode:
authorYoan Blanc <yoan@dosimple.ch>2023-04-06 22:01:20 +0200
committerGitHub <noreply@github.com>2023-04-06 16:01:20 -0400
commit9b416b2e36a035672226d4b83c6b7e87578b17fe (patch)
treeede783a30f3de218f5db6a49d82a786b1c7c57d2 /routers/web/repo/editor.go
parent797babbfcbcf845fe12c8659fffa1693ec4708bb (diff)
downloadgitea-9b416b2e36a035672226d4b83c6b7e87578b17fe.tar.gz
gitea-9b416b2e36a035672226d4b83c6b7e87578b17fe.zip
Use graceful editorconfig loader to reduce errors when loading malformed editorconfigs (#21257)
The _graceful_ should fail less when the `.editorconfig` file isn't properly written, e.g. boolean values from YAML or unparseable numbers (when a number is expected). As is... information is lost as the _warning_ (a go-multierror.Error) is ignored. If anybody knows how to send them to the UI as warning; any help is appreciated. Closes #20694 Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
Diffstat (limited to 'routers/web/repo/editor.go')
-rw-r--r--routers/web/repo/editor.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go
index f65e1ad3d8..476c1d5ddd 100644
--- a/routers/web/repo/editor.go
+++ b/routers/web/repo/editor.go
@@ -165,7 +165,7 @@ func editFile(ctx *context.Context, isNewFile bool) {
// GetEditorConfig returns a editorconfig JSON string for given treePath or "null"
func GetEditorConfig(ctx *context.Context, treePath string) string {
- ec, err := ctx.Repo.GetEditorconfig()
+ ec, _, err := ctx.Repo.GetEditorconfig()
if err == nil {
def, err := ec.GetDefinitionForFilename(treePath)
if err == nil {