From ae33ab00eda723d198edf3e14fc92b16ea5ac715 Mon Sep 17 00:00:00 2001
From: John Solncev <deeppurple.studio@yandex.ru>
Date: Mon, 7 Jun 2021 13:50:31 +0300
Subject: [PATCH] Add new mode to status line. Change status line colors.

---
 colors/my_first_scheme.vim |  5 ++---
 vimrc                      | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/colors/my_first_scheme.vim b/colors/my_first_scheme.vim
index d9e0101..cbbdd22 100644
--- a/colors/my_first_scheme.vim
+++ b/colors/my_first_scheme.vim
@@ -18,15 +18,14 @@ hi NonText                ctermfg=215                              guifg=#ffaf5f
 hi Visual                             ctermbg=241                                guibg=#626262
 
 "Цвета, используемые в статусной строке
-hi StatusLineEditorMode   ctermfg=15  ctermbg=57   cterm=bold      guifg=#ffffff guibg=#5f00ff gui=bold
+hi StatusLineEditorMode   ctermfg=0   ctermbg=41                   guifg=#ffffff guibg=#5f00ff gui=bold
 hi StatusLineFilePath     ctermfg=0   ctermbg=15                   guifg=#000000 guibg=#ffffff
 hi StatusLineFileFormat   ctermfg=0   ctermbg=251                  guifg=#000000 guibg=#c6c6c6
 hi StatusLineEmpty                    ctermbg=239                                guibg=#4e4e4e
 hi StatusLineReadOnlyFlag ctermfg=0   ctermbg=239                                guibg=#4e4e4e
 hi StatusLineEncoding     ctermfg=0   ctermbg=251                  guifg=#000000 guibg=#c6c6c6
 hi StatusLineFileType     ctermfg=0   ctermbg=15                   guifg=#000000 guibg=#ffffff
-hi StatusLinePosition     ctermfg=15  ctermbg=57                   guifg=#ffffff guibg=#5f00ff
-hi StatusLinePercentPos   ctermfg=15  ctermbg=63                   guifg=#ffffff guibg=#5f5fff
+hi StatusLinePosition     ctermfg=0   ctermbg=41                   guifg=#ffffff guibg=#5f00ff
 
 "Vim-Gitgutter цвета
 hi SignColumn                         ctermbg=NONE                               guibg=NONE
diff --git a/vimrc b/vimrc
index e284272..12d1a8d 100644
--- a/vimrc
+++ b/vimrc
@@ -3,7 +3,8 @@ function GetMode()
     let l:editor_mode = mode()
 
     let l:editor_modes_list = [
-        \ "NORMAL", 
+        \ "NORMAL",
+        \ "COMMAND",
         \ "INSERT",
         \ "VISUAL",
         \ "VISUAL-LINE",
@@ -14,20 +15,24 @@ function GetMode()
     if l:editor_mode == "n"
         return l:editor_modes_list[0]
 
-    elseif l:editor_mode == "i"
+    elseif l:editor_mode == "c"
         return l:editor_modes_list[1]
 
-    elseif l:editor_mode == "v"
+    elseif l:editor_mode == "i"
         return l:editor_modes_list[2]
-    elseif l:editor_mode == "V"
-        return l:editor_modes_list[3]
-    elseif l:editor_mode =="\<C-v>"
-        return l:editor_modes_list[4]
 
-    elseif l:editor_mode == "R"
+    elseif l:editor_mode == "v"
+        return l:editor_modes_list[3]
+    elseif l:editor_mode == "V"
+        return l:editor_modes_list[4]
+    elseif l:editor_mode =="\<C-v>"
         return l:editor_modes_list[5]
 
+    elseif l:editor_mode == "R"
+        return l:editor_modes_list[6]
+
     else
+        echo l:editor_mode
         return "?MODE"
     endif
 endfunction
@@ -66,8 +71,7 @@ set statusline+=%#StatusLineEmpty#%=
 set statusline+=%#StatusLineReadOnlyFlag#\ %r\ 
 set statusline+=%#StatusLineEncoding#\ %{&fileencoding?&fileencoding:&encoding}\ 
 set statusline+=%#StatusLineFileType#\ %{&ft}\ 
-set statusline+=%#StatusLinePercentPos#\ %p%%\ 
-set statusline+=%#StatusLinePosition#\ %l:%c\ 
+set statusline+=%#StatusLinePosition#\ %p%%\ %l:%c\ 
 
 "Выключает перенос строк
 set nowrap