From 66d4c714c481b9c3f47b44c2456e7af6f4ac13f0 Mon Sep 17 00:00:00 2001
From: Vasiliy Vasilyuk <xorcare@gmail.com>
Date: Sun, 11 Feb 2024 20:50:44 +0300
Subject: [PATCH] Update .editorconfig and reformat code

The settings for yaml files regularly get confused and I don't like it,
so I add them to .editorconfig to make the settings always the same.
---
 .editorconfig                | 17 ++++++++++++++++-
 .github/dependabot.yml       | 16 ++++++++--------
 .github/workflows/gitlab.yml |  2 +-
 .github/workflows/go.yml     |  2 +-
 docker-compose.yml           |  2 +-
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index d7701e1..183fed5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,14 +3,29 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = 2
+indent_size = 4
 indent_style = space
 insert_final_newline = true
 max_line_length = 100
 tab_width = 4
+ij_visual_guides = 50, 72, 80, 100
+ij_wrap_on_typing = false
 
 [Makefile]
 indent_style = tab
 
 [*.go]
 indent_style = tab
+
+[{*.yaml,*.yml}]
+indent_size = 2
+ij_yaml_align_values_properties = do_not_align
+ij_yaml_autoinsert_sequence_marker = true
+ij_yaml_block_mapping_on_new_line = false
+ij_yaml_indent_sequence_value = true
+ij_yaml_keep_indents_on_empty_lines = false
+ij_yaml_keep_line_breaks = true
+ij_yaml_sequence_on_new_line = false
+ij_yaml_space_before_colon = false
+ij_yaml_spaces_within_braces = false
+ij_yaml_spaces_within_brackets = false
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0d48785..2cd0000 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,12 +2,12 @@
 
 version: 2
 updates:
-- package-ecosystem: "gomod"
-  directory: "/"
-  schedule:
-    interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"
 
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/gitlab.yml b/.github/workflows/gitlab.yml
index f82b372..1ae70d2 100644
--- a/.github/workflows/gitlab.yml
+++ b/.github/workflows/gitlab.yml
@@ -3,7 +3,7 @@ name: GitLab
 on:
   push:
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index bc8e3e3..34be391 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -3,7 +3,7 @@ name: Go
 on:
   push:
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
   workflow_dispatch:
 
 jobs:
diff --git a/docker-compose.yml b/docker-compose.yml
index f0a7107..d5e0882 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,7 @@ services:
 
   migrate:
     image: migrate/migrate:v4.16.2
-    command: > 
+    command: >
       -source 'file:///migrations'
       -database 'postgresql://postgres:postgres@postgres:5432/reference?sslmode=disable' up
     depends_on: