Remove use of red from bools, fix numbers.

2024-09-11 14:56:46 +03:00 · 2019-11-27 09:12:34 +10:30 · 2019-11-27 09:12:34 +10:30 · 0bc7472a0f
commit 0bc7472a0f
parent 4f7c122c55
11 changed files with 37 additions and 33 deletions
--- a/autoload/airline/themes/falcon.vim
+++ b/autoload/airline/themes/falcon.vim
@ -4,7 +4,7 @@
 " URL:https://github.com/fenetikm/falcon
 " Author: Michael Welford
 " License: MIT
-" Last Change: 2019/11/04 14:59
+" Last Change: 2019/11/27 09:09
 " ============================================================

 let g:airline#themes#falcon#palette = {}
@ -29,9 +29,9 @@ let s:visual2 = [ "#b4b4b9", "#36363a", 249, 237 ]
 let s:visual3 = [ "#b4b4b9", "#28282d", 249, 235 ]
 let g:airline#themes#falcon#palette.visual = airline#themes#generate_color_map(s:visual1, s:visual2, s:visual3)

-let s:inactive1 = [ "#57575e", "#212127", 240, 235 ]
-let s:inactive2 = [ "#57575e", "#212127", 240, 235 ]
-let s:inactive3 = [ "#57575e", "#212127", 240, 235 ]
+let s:inactive1 = [ "#57575e", "#1c1c22", 240, 234 ]
+let s:inactive2 = [ "#57575e", "#1c1c22", 240, 234 ]
+let s:inactive3 = [ "#57575e", "#1c1c22", 240, 234 ]
 let g:airline#themes#falcon#palette.inactive = airline#themes#generate_color_map(s:inactive1, s:inactive2, s:inactive3)

 if !get(g:, 'loaded_ctrlp', 0)
--- a/autoload/lightline/colorscheme/falcon.vim
+++ b/autoload/lightline/colorscheme/falcon.vim
@ -13,9 +13,9 @@ if exists('g:lightline')
  let s:p.normal.left = [[["#000004", 0], ["#dfdfe5", 254]], [["#d4d4d9", 248], ["#28282d", 241]]]
  let s:p.normal.right = [[["#000004", 0], ["#dfdfe5", 254]], [["#787882", 248], ["#28282d", 241]]]
  let s:p.normal.middle = [[["#57575e", 241], ["#28282d", 237]]]
-  let s:p.inactive.left = [[["#57575e", 241], ["#151521", 237], 'italic'], [["#5a5a60", 241], ["#151521", 237], 'italic']]
-  let s:p.inactive.right = [[["#57575e", 241], ["#151521", 237], 'italic'], [["#5a5a60", 241], ["#151521", 237], 'italic']]
-  let s:p.inactive.middle = [[["#57575e", 241], ["#151521", 237], 'italic']]
+  let s:p.inactive.left = [[["#57575e", 241], ["#1c1c22", 237], 'italic'], [["#5a5a60", 241], ["#1c1c22", 237], 'italic']]
+  let s:p.inactive.right = [[["#57575e", 241], ["#1c1c22", 237], 'italic'], [["#5a5a60", 241], ["#1c1c22", 237], 'italic']]
+  let s:p.inactive.middle = [[["#57575e", 241], ["#1c1c22", 237], 'italic']]
  let s:p.insert.left = [[["#000004", 0], ["#ff3600", 202]], [["#d4d4d9", 248], ["#28282d", 241]]]
  let s:p.insert.right = [[["#000004", 0], ["#ff3600", 202]], [["#787882", 248], ["#28282d", 241]]]
  let s:p.insert.middle = [[["#57575e", 241], ["#28282d", 241]]]
--- a/colors/falcon.vim
+++ b/colors/falcon.vim
@ -4,7 +4,7 @@
 " URL: https://github.com/fenetikm/falcon
 " Author: Michael Welford
 " License: MIT
-" Last Change: 2019/11/04 14:59
+" Last Change: 2019/11/27 09:09
 " ===============================================================

 set background=dark
@ -76,8 +76,8 @@ hi Comment guifg=#787882 ctermfg=243 guibg=NONE ctermbg=NONE gui=Italic cterm=It
 hi Constant guifg=#dfdfe5 ctermfg=254 guibg=NONE ctermbg=NONE gui=Bold cterm=Bold
 hi String guifg=#c8d0e3 ctermfg=252 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
 hi link Character String
-hi Boolean guifg=#ff3600 ctermfg=202 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
-hi Number guifg=#dfdfe5 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
+hi Boolean guifg=#dfdfe5 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
+hi Number guifg=#b4b4b9 ctermfg=249 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
 hi link Float Number
 hi Identifier guifg=#99a4bc ctermfg=248 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
 hi Function guifg=#ffc552 ctermfg=221 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
@ -310,8 +310,6 @@ hi phpStaticClasses guifg=#b4b4b9 ctermfg=249 guibg=NONE ctermbg=NONE gui=Bold c
 hi phpClassImplements guifg=#b4b4b9 ctermfg=249 guibg=NONE ctermbg=NONE gui=Italic cterm=Italic
 hi link phpClassExtends phpClassImplements
 hi phpStructure guifg=#99a4bc ctermfg=248 guibg=NONE ctermbg=NONE gui=Bold cterm=Bold
-hi phpNumber guifg=#dfdfe5 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
-hi link phpFloat phpNumber
 hi phpMethod guifg=#b4b4b9 ctermfg=249 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
 hi phpFunctions guifg=#ddcfbf ctermfg=187 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
 hi phpRepeat guifg=#ffc552 ctermfg=221 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
@ -325,7 +323,7 @@ hi link phpIdentifier Identifier
 hi phpStringDelimiter guifg=#dfdfe5 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
 hi phpSuperglobals guifg=#9f97cc ctermfg=140 guibg=NONE ctermbg=NONE gui=Bold cterm=Bold
 hi phpSpecialChar guifg=#99a4bc ctermfg=248 guibg=NONE ctermbg=NONE gui=Bold cterm=Bold
-hi phpNullValue guifg=#ff3600 ctermfg=202 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
+hi link phpNullValue phpBoolean
 hi plugDeleted guifg=#ff3600 ctermfg=202 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
 hi plugBracket guifg=#ff761a ctermfg=208 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
 hi plug1 guifg=#ddcfbf ctermfg=187 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
@ -352,7 +350,6 @@ hi rubyControl guifg=#ffc552 ctermfg=221 guibg=NONE ctermbg=NONE gui=NONE cterm=
 hi rubyConstant guifg=#c8d0e3 ctermfg=252 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
 hi rubyGlobalVariable guifg=#9f97cc ctermfg=140 guibg=NONE ctermbg=NONE gui=Bold cterm=Bold
 hi rubySymbol guifg=#99a4bc ctermfg=248 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
-hi rubyPseudoVariable guifg=#9f97cc ctermfg=140 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
 hi link rubyArrayDelimiter Delimiter
 hi rubyBlockParameterList guifg=#99a4bc ctermfg=248 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
 hi link rubyCurlyBlockDelimiter Delimiter
--- a/corpus/js.js
+++ b/corpus/js.js
@ -35,6 +35,8 @@ const unlinkHandler = (err) => {
  }
 };

+const bool = false;
+
 console.log('Check.');

 // Watch for filesystem changes.
--- a/corpus/php.php
+++ b/corpus/php.php
@ -42,6 +42,9 @@ class CcspUserService implements CcspUserServiceInterface {
      ->setEmail($email)
      ->save();

+    $a_flag = FALSE;
+    $a_number = 0;
+
    // @TODO fix this up, plaz.
    return $reviewer;
  }
--- a/corpus/php_old.php
+++ b/corpus/php_old.php
@ -20,6 +20,8 @@ function main() {
      error('Invalid API key specified');
    }

+    $thing = FALSE;
+
    // Check API credentials.
    $sql = <<<EOSQL
 SELECT *
--- a/estilo/palettes/falcon.yml
+++ b/estilo/palettes/falcon.yml
@ -27,7 +27,7 @@ purple_dark_gray:  '#3f3a59'
 purple:            '#635196'
 lavender:          '#9f97cc'
 status:            '#28282d'
-inactive_status:   '#212127'
+inactive_status:   '#1c1c22'
 off_red:           '#300e03'
 off_blue:          '#031630'
 off_green:         '#203003'
--- a/estilo/syntax/base.yml
+++ b/estilo/syntax/base.yml
@ -49,8 +49,8 @@ Comment: 'mid_gray - i'
 Constant: 'light_gray - b'
 String: 'light_blue_gray' # Constant
 Character: '@String' # Constant
-Boolean: 'red' # Constant
-Number: 'light_gray' # Constant
+Boolean: 'light_gray' # Constant
+Number: 'normal_gray' # Constant
 Float: '@Number' # Constant
 Identifier: 'blue_gray'
 Function: 'yellow' # Identifier
--- a/estilo/syntax/php.yml
+++ b/estilo/syntax/php.yml
@ -19,8 +19,8 @@ phpStructure: 'blue_gray - b' # Structure
 phpStringSingle: '' # String
 phpStringDouble: '' # String
 phpBacktick: '' # String
-phpNumber: 'light_gray' # Number
-phpFloat: '@phpNumber' # Float
+phpNumber: '' # Number
+phpFloat: '' # Float
 phpMethod: 'normal_gray' # Function
 phpFunctions: 'tan' # Function
 phpBaselib: '' # Function
@ -60,4 +60,4 @@ phpIdentifierSimply: '' # Identifier
 phpStringDelimiter: 'light_gray'
 phpSuperglobals: 'lavender - b'
 phpSpecialChar: 'blue_gray - b'
-phpNullValue: 'red'
+phpNullValue: '@phpBoolean'
--- a/estilo/syntax/ruby.yml
+++ b/estilo/syntax/ruby.yml
@ -34,7 +34,7 @@ rubyBeginEnd: '' # Statement
 rubyAccess: '' # Statement
 rubyAttribute: '' # Statement
 rubyEval: '' # Statement
-rubyPseudoVariable: 'lavender' # Constant
+rubyPseudoVariable: '' # Constant
 rubyComment: '' # Comment
 rubyData: '' # Comment
 rubyDataDirective: '' # Delimiter
--- a/plugin/falcon.vim
+++ b/plugin/falcon.vim
@ -11,18 +11,18 @@ let g:loaded_falcon=1
 " Required as colors will come from terminal without
 let g:fzf_colors=
  \ { 'fg':      ['fg', 'Comment'],
-  \ 'bg':      ['bg', 'Normal'],
-  \ 'hl':      ['fg', 'Normal'],
-  \ 'fg+':     ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
-  \ 'bg+':     ['bg', 'CursorLine', 'CursorColumn'],
-  \ 'hl+':     ['fg', 'Keyword'],
-  \ 'info':    ['fg', 'PreProc'],
-  \ 'border':  ['fg', 'Ignore'],
-  \ 'prompt':  ['fg', 'Conditional'],
-  \ 'pointer': ['fg', 'Exception'],
-  \ 'marker':  ['fg', 'Keyword'],
-  \ 'spinner': ['fg', 'Label'],
-  \ 'header':  ['fg', 'Comment'] }
+    \ 'bg':      ['bg', 'Normal'],
+    \ 'hl':      ['fg', 'Normal'],
+    \ 'fg+':     ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
+    \ 'bg+':     ['bg', 'CursorLine', 'CursorColumn'],
+    \ 'hl+':     ['fg', 'Keyword'],
+    \ 'info':    ['fg', 'PreProc'],
+    \ 'border':  ['fg', 'Ignore'],
+    \ 'prompt':  ['fg', 'Conditional'],
+    \ 'pointer': ['fg', 'Exception'],
+    \ 'marker':  ['fg', 'Keyword'],
+    \ 'spinner': ['fg', 'Label'],
+    \ 'header':  ['fg', 'Comment'] }

 function s:HandleInactiveBackground()
  " NeoVim has support for changing background colour depending on active or not