From 4967d87408cce169f014fe7c728a976b720e2901 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Thu, 5 Dec 2024 09:50:47 +0100 Subject: [PATCH] align protobuf format with lsp Signed-off-by: Kristoffer Dalby --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 719393f5..96aff1fd 100644 --- a/Makefile +++ b/Makefile @@ -38,10 +38,16 @@ test_integration: lint: golangci-lint run --fix --timeout 10m -fmt: +fmt: fmt-go fmt-prettier fmt-proto + +fmt-prettier: prettier --write '**/**.{ts,js,md,yaml,yml,sass,css,scss,html}' + +fmt-go: golines --max-len=88 --base-formatter=gofumpt -w $(GO_SOURCES) - clang-format -style="{BasedOnStyle: Google, IndentWidth: 4, AlignConsecutiveDeclarations: true, AlignConsecutiveAssignments: true, ColumnLimit: 0}" -i $(PROTO_SOURCES) + +fmt-proto: + clang-format -i $(PROTO_SOURCES) proto-lint: cd proto/ && go run github.com/bufbuild/buf/cmd/buf lint