molokai: add airline_term highlight group

Signed-off-by: Christian Brabandt <cb@256bit.org>

.github/workflows/ci.yml

@@ -1,12 +1,8 @@
-name: CI
-
 on:
   push:
     branches:
     - master
   pull_request:
-    branches:
-    - master
 
 jobs:
   test:
@@ -15,29 +11,34 @@ jobs:
     strategy:
       matrix:
         vim:
+        - v8.2.2000
         - v8.2.1000
         - v8.2.0000
         - v8.1.0000
         - v8.0.0000
-        - v7.4
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
-
-    - name: Checkout vim-themis
-      uses: actions/checkout@v3
-      with:
-        repository: thinca/vim-themis
-        path: vim-themis
+      uses: actions/checkout@main
 
     - name: Setup Vim
       uses: rhysd/action-setup-vim@v1
-      id: vim
       with:
         version: ${{ matrix.vim }}
 
-    - name: Test
-      env:
-        THEMIS_VIM: ${{ steps.vim.outputs.executable }}
-      run: ./vim-themis/bin/themis --reporter spec
+    - name: Install Dependencies
+      run: | 
+        git clone https://github.com/junegunn/vader.vim.git
+        git clone https://github.com/vim-airline/vim-airline
+        find $PWD/autoload/airline/themes -name "*.vim" > themes.txt
+    - name: Run Test
+      run: |
+        vim --not-a-term -Nu <(cat << VIMRC
+        filetype off
+        set rtp+=vader.vim
+        set rtp+=vim-airline
+        set rtp+=.
+        set rtp+=after
+        filetype plugin indent on
+        syntax enable
+        VIMRC) -c 'Vader! test/*' > /dev/null

.gitignore

@@ -1,3 +1,2 @@
 .DS_Store
 doc/tags
-test/.deps

autoload/airline/themes/atomic.vim

@@ -7,14 +7,16 @@
 "
 "----------------------------------------------------------------
 "  Theme   : Atomic
-"  Version : 2.1.0
+"  Version : 2.3.0
 "  License : MIT
 "  Author  : Gerard Bajona
 "  URL     : https://github.com/gerardbm/atomic
 " ----------------------------------------------------------------
 "  Colors will be adapted to the current colorscheme. For better
-"  contrast use the atomic colorscheme: it has ten color palettes
-"  with sixteen colors selected procedurally (algorithms).
+"  contrast, use the atomic colorscheme: it has 22 color palettes
+"  with sixteen colors selected procedurally through algorithms.
+"  It was designed using HSLuv and ΔE00 to ensure harmony and
+"  contrast across light and dark modes.
 "
 "  Atomic colorscheme: https://github.com/gerardbm/vim-atomic
 " ----------------------------------------------------------------
@@ -38,11 +40,21 @@ function! airline#themes#atomic#refresh()
 	let s:R3 = airline#themes#get_highlight2(['ErrorMsg', 'fg'], ['StatusLine', 'bg'], 'none')
 	let g:airline#themes#atomic#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
 
+	let s:T1 = airline#themes#get_highlight2(['LineNr', 'bg'], ['Boolean', 'fg'])
+	let s:T2 = airline#themes#get_highlight2(['LineNr', 'bg'], ['LineNr', 'fg'], 'none')
+	let s:T3 = airline#themes#get_highlight2(['Boolean', 'fg'], ['StatusLine', 'bg'])
+	let g:airline#themes#atomic#palette.terminal = airline#themes#generate_color_map(s:T1, s:T2, s:T3)
+
 	let s:V1 = airline#themes#get_highlight2(['LineNr', 'bg'], ['WarningMsg', 'fg'], 'none')
 	let s:V2 = airline#themes#get_highlight2(['LineNr', 'bg'], ['LineNr', 'fg'], 'none')
 	let s:V3 = airline#themes#get_highlight2(['WarningMsg', 'fg'], ['StatusLine', 'bg'], 'none')
 	let g:airline#themes#atomic#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 
+	let s:C1 = airline#themes#get_highlight2(['LineNr', 'bg'], ['Structure', 'fg'], 'none')
+	let s:C2 = airline#themes#get_highlight2(['LineNr', 'bg'], ['LineNr', 'fg'], 'none')
+	let s:C3 = airline#themes#get_highlight2(['Structure', 'fg'], ['StatusLine', 'bg'], 'none')
+	let g:airline#themes#atomic#palette.commandline = airline#themes#generate_color_map(s:C1, s:C2, s:C3)
+
 	let s:IA1 = airline#themes#get_highlight2(['LineNr', 'fg'], ['StatusLine', 'bg'], 'none')
 	let s:IA2 = airline#themes#get_highlight2(['LineNr', 'fg'], ['StatusLine', 'bg'], 'none')
 	let s:IA3 = airline#themes#get_highlight2(['LineNr', 'fg'], ['StatusLine', 'bg'], 'none')

autoload/airline/themes/molokai.vim

@@ -64,6 +64,7 @@ let s:IA = [ '#1b1d1e' , '#465457' , 233 , 67 , '' ]
 let g:airline#themes#molokai#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
 let g:airline#themes#molokai#palette.inactive_modified = {
       \ 'airline_c': [ '#f8f8f0' , ''        , 253 , ''  , '' ] ,
+      \ 'airline_term': [ '#000000' , '#ff0000'        , 'black' , 'red'  , '' ] ,
       \ }
 
 " CtrlP

doc/airline-themes.txt

@@ -1,4 +1,4 @@
-*airline-themes.txt*  Themes for vim-airline
+*airline-themes.txt*	Themes for vim-airline
                    _                       _      _ _                        ~
             __   _(_)_ __ ___         __ _(_)_ __| (_)_ __   ___             ~
             \ \ / / | '_ ` _ \ _____ / _` | | '__| | | '_ \ / _ \            ~

test/.themisrc

@@ -1,4 +0,0 @@
-let s:deps = themis#helper('deps')
-call s:deps.git('vim-airline/vim-airline')
-
-call themis#helper('command')

test/airline-themes.vader

@@ -0,0 +1,38 @@
+# Make sure that theme and 5 basic modes don't throw an error
+# Get list of all included themes
+Execute (validate themes):
+  let themes = readfile('themes.txt')
+  call sort(themes)
+
+  let err_proc = v:false
+  try
+
+    for themePath in themes
+
+      " Check all the basic modes and their modified counterparts
+      " This test only fails on exceptional cases
+      let theme = fnamemodify(themePath, ':t:r')
+      Log theme
+      execute('AirlineTheme ' . theme)
+      execute('source ' . themePath)
+      normal! i
+      normal! :
+      normal! R
+      normal! v
+      setlocal mod
+      normal! i
+      normal! :
+      normal! R
+      normal! v
+      setlocal nomod
+
+    endfor
+
+  catch
+    let err_proc = v:true
+    Log "Failed validation testing with exception:"
+    Log string(v:exception)
+  endtry
+  AirlineRefresh
+
+  Assert !err_proc

test/airline-themes.vim

@@ -1,35 +0,0 @@
-scriptencoding utf-8
-
-let s:themes_dir = expand('<sfile>:h:h') . '/autoload/airline/themes'
-let s:themes = map(glob(s:themes_dir . '/*.vim', 1, 1), 'fnamemodify(v:val, ":t:r")')
-let s:suite = themis#suite('vim-airline-themes')
-
-function! s:Test_AirlineTheme(theme)
-  Throws execute('AirlineTheme ' . a:theme)
-endfunction
-
-function! s:command_insert(theme)
-  execute('AirlineTheme ' . a:theme)
-  execute('source ' . expand('<sfile>:h:h') . '/autoload/airline/themes/' . a:theme . '.vim')
-  Throws normal! i
-endfunction
-
-function! s:command_command(theme)
-  execute('AirlineTheme ' . a:theme)
-  execute('source ' . expand('<sfile>:h:h') . '/autoload/airline/themes/' . a:theme . '.vim')
-  Throws normal! :
-endfunction
-
-function! s:suite.__insert__()
-  let child = themis#suite('INSERT')
-  for theme in s:themes
-    let child[theme] = funcref('s:command_insert', [theme])
-  endfor
-endfunction
-
-function! s:suite.__command__()
-  let child = themis#suite('COMMAND')
-  for theme in s:themes
-    let child[theme] = funcref('s:command_command', [theme])
-  endfor
-endfunction