Merge the changes done to the Ruby syntax

It closes #14 on Github.
This commit is contained in:
Ludovic Koenig
2019-09-28 10:15:32 +02:00
3 changed files with 59 additions and 7 deletions
+15
View File
@@ -3,6 +3,20 @@
All notable changes to this project will be documented in this file. This All notable changes to this project will be documented in this file. This
project adheres to [Semantic Versioning]. project adheres to [Semantic Versioning].
## [Unreleased]
### Changed
- Changed the color scheme for Ruby files:
+ Ruby booleans, 'nil', numbers and string delimitiers are using the `Normal`
syntax group.
+ `rubySymbol` are relinked to `rubyConstant`.
+ Some Ruby keywords are relinked to `Statement` to make the scheme more
coherent.
## [0.5.0] - 2019-09-17 ## [0.5.0] - 2019-09-17
### Added ### Added
@@ -203,6 +217,7 @@ project adheres to [Semantic Versioning].
+ Otherwise, a GUI version of Vim must be used. + Otherwise, a GUI version of Vim must be used.
[Unreleased]: https://github.com/ludokng/vim-odyssey/compare/0.5.0...HEAD
[0.5.0]: https://github.com/ludokng/vim-odyssey/compare/0.4.0...0.5.0 [0.5.0]: https://github.com/ludokng/vim-odyssey/compare/0.4.0...0.5.0
[0.4.0]: https://github.com/ludokng/vim-odyssey/compare/0.3.0...0.4.0 [0.4.0]: https://github.com/ludokng/vim-odyssey/compare/0.3.0...0.4.0
[0.3.0]: https://github.com/ludokng/vim-odyssey/compare/0.2.0...0.3.0 [0.3.0]: https://github.com/ludokng/vim-odyssey/compare/0.2.0...0.3.0
+26
View File
@@ -0,0 +1,26 @@
" __ ____
" _____ __ __ / /_ __ __ / __/____ _____
" / ___// / / // __ \ / / / / / /_ / __ \ / ___/
" / / / /_/ // /_/ // /_/ / / __// /_/ // /
" /_/ \__,_//_.___/ \__, / /_/ \____//_/
" __ /____/
" ____ ____/ /__ __ _____ _____ ___ __ __
" / __ \ / __ // / / // ___// ___// _ \ / / / /
" / /_/ // /_/ // /_/ /(__ )(__ )/ __// /_/ /
" \____/ \__,_/ \__, //____//____/ \___/ \__, /
" /____/ /____/
"
" Note: This script only defines the syntax group named rubyOdysseyNil, because
" otherwise nil is considered to be a rubyPseudoVariable
"
" Maintainer: Ludovic Koenig <ludovic.koenig@gmail.com>
" Version: 0.6.0
" Since: 0.6.0
" License: MIT
"
" Ruby Syntax {{{
syntax keyword rubyOdysseyNil nil
" }}}
" vim: foldmethod=marker
+12 -1
View File
@@ -320,13 +320,24 @@ call s:l( 'rubyDefine', 'Statement')
call s:l( 'rubyInclude', 'Statement') call s:l( 'rubyInclude', 'Statement')
call s:h( 'rubyInstanceVariable', 'background', 'warning', 'italic') call s:h( 'rubyInstanceVariable', 'background', 'warning', 'italic')
call s:l('rubyInterpolationDelimiter', 'Function') call s:l('rubyInterpolationDelimiter', 'Function')
call s:l( 'rubyStringDelimiter', 'Constant') call s:l( 'rubyStringDelimiter', 'Normal')
call s:l( 'rubyAccess', 'Statement')
call s:l( 'rubyAttribute', 'Statement')
call s:l( 'rubyPseudoVariable', 'Special')
call s:l( 'rubySymbol', 'rubyConstant')
call s:h( 'rubyBlockParameter', 'background', 'procedure', 'italic')
call s:l( 'rubyOdysseyNil', 'Normal')
call s:l( 'rubyBoolean', 'Normal')
call s:l( 'rubyFloat', 'Normal')
call s:l( 'rubyInteger', 'Normal')
" }}} " }}}
" Rust Highlights {{{ " Rust Highlights {{{
call s:l( 'rustLifetime', 'Constant') call s:l( 'rustLifetime', 'Constant')
call s:l( 'rustQuestionMark', 'Operator') call s:l( 'rustQuestionMark', 'Operator')
call s:l('rustOdysseyFunction', 'Function') call s:l('rustOdysseyFunction', 'Function')
call s:l( 'rustOdysseyType', 'Type') call s:l( 'rustOdysseyType', 'Type')
" }}} " }}}
" vim: foldmethod=marker " vim: foldmethod=marker