Mercurial > vim

view runtime/syntax/raml.vim @ 35308:22c03485f222 v9.1.0456

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0 Commit: https://github.com/vim/vim/commit/88d4f255b7b7a19bb4f6489e0ad0956e47d51fed Author: Gary Johnson <garyjohn@spocom.com> Date: Sat Jun 1 20:51:33 2024 +0200 patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0 Problem: Left shift is incorrect with vartabstop and shiftwidth=0 Solution: make tabstop_at() function aware of shift direction (Gary Johnson) The problem was that with 'vartabstop' set and 'shiftwidth' equal 0, left shifts using << were shifting the line to the wrong column. The tabstop to the right of the first character in the line was being used as the shift amount instead of the tabstop to the left of that first character. The reason was that the tabstop_at() function always returned the value of the tabstop to the right of the given column and was not accounting for the direction of the shift. The solution was to make tabstop_at() aware of the direction of the shift and to choose the tabtop accordingly. A test was added to check this behavior and make sure it doesn't regress. While at it, also fix a few indentation/alignment issues. fixes: #14864 closes: #14887 Signed-off-by: Gary Johnson <garyjohn@spocom.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Sat, 01 Jun 2024 21:00:03 +0200
parents 2b30a2b4bde2
children
line wrap: on
line source

" Vim syntax file
" Language:    RAML (RESTful API Modeling Language)
" Maintainer:  Eric Hopkins <eric.on.tech@gmail.com>
" URL:         https://github.com/in3d/vim-raml
" License:     Same as Vim
" Last Change: 2018-11-03

if exists("b:current_syntax")
  finish
endif

let s:cpo_save = &cpo
set cpo&vim

syn keyword ramlTodo            contained TODO FIXME XXX NOTE

syn region  ramlComment         display oneline start='\%(^\|\s\)#' end='$'
                                \ contains=ramlTodo,@Spell

syn region  ramlVersion         display oneline start='#%RAML' end='$'

syn match   ramlNodeProperty    '!\%(![^\\^%     ]\+\|[^!][^:/   ]*\)'

syn match   ramlAnchor          '&.\+'

syn match   ramlAlias           '\*.\+'

syn match   ramlDelimiter       '[-,:]'
syn match   ramlBlock           '[\[\]{}>|]'
syn match   ramlOperator        '[?+-]'
syn match   ramlKey             '\h\+\(?\)\?\ze\s*:'
syn match   ramlKey             '\w\+\(\s\+\w\+\)*\(?\)\?\ze\s*:'
syn match   routeKey            '\/\w\+\(\s\+\w\+\)*\ze\s*:'
syn match   routeKey            'application\/\w\+\ze\s*:'
syn match   routeParamKey       '\/{\w\+}*\ze\s*:'

syn region  ramlString          matchgroup=ramlStringDelimiter
                                \ start=+\s"+ skip=+\\"+ end=+"+
                                \ contains=ramlEscape
syn region  ramlString          matchgroup=ramlStringDelimiter
                                \ start=+\s'+ skip=+''+ end=+'+
                                \ contains=ramlStringEscape
syn region  ramlParameter       matchgroup=ramlParameterDelimiter
                                \ start=+<<+ skip=+''+ end=+>>+
syn match   ramlEscape          contained display +\\[\\"abefnrtv^0_ NLP]+
syn match   ramlEscape          contained display '\\x\x\{2}'
syn match   ramlEscape          contained display '\\u\x\{4}'
syn match   ramlEscape          contained display '\\U\x\{8}'
syn match   ramlEscape          display '\\\%(\r\n\|[\r\n]\)'
syn match   ramlStringEscape    contained +''+

syn match   ramlNumber          display
                                \ '\<[+-]\=\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\='
syn match   ramlNumber          display '0\o\+'
syn match   ramlNumber          display '0x\x\+'
syn match   ramlNumber          display '([+-]\=[iI]nf)'
syn match   ramlNumber          display '(NaN)'

syn match   ramlConstant        '\<[~yn]\>'
syn keyword ramlConstant        true True TRUE false False FALSE
syn keyword ramlConstant        yes Yes on ON no No off OFF
syn keyword ramlConstant        null Null NULL nil Nil NIL

syn keyword httpVerbs           get post put delete head patch options
syn keyword ramlTypes           string number integer date boolean file

syn match   ramlTimestamp       '\d\d\d\d-\%(1[0-2]\|\d\)-\%(3[0-2]\|2\d\|1\d\|\d\)\%( \%([01]\d\|2[0-3]\):[0-5]\d:[0-5]\d.\d\d [+-]\%([01]\d\|2[0-3]\):[0-5]\d\|t\%([01]\d\|2[0-3]\):[0-5]\d:[0-5]\d.\d\d[+-]\%([01]\d\|2[0-3]\):[0-5]\d\|T\%([01]\d\|2[0-3]\):[0-5]\d:[0-5]\d.\dZ\)\='

syn region  ramlDocumentHeader  start='---' end='$' contains=ramlDirective
syn match   ramlDocumentEnd     '\.\.\.'

syn match   ramlDirective       contained '%[^:]\+:.\+'

hi def link ramlVersion            String
hi def link routeInterpolation     String
hi def link ramlInterpolation      Constant
hi def link ramlTodo               Todo
hi def link ramlComment            Comment
hi def link ramlDocumentHeader     PreProc
hi def link ramlDocumentEnd        PreProc
hi def link ramlDirective          Keyword
hi def link ramlNodeProperty       Type
hi def link ramlAnchor             Type
hi def link ramlAlias              Type
hi def link ramlBlock              Operator
hi def link ramlOperator           Operator
hi def link routeParamKey          SpecialChar
hi def link ramlKey                Identifier
hi def link routeKey               SpecialChar
hi def link ramlParameterDelimiter Type
hi def link ramlParameter          Type
hi def link ramlString             String
hi def link ramlStringDelimiter    ramlString
hi def link ramlEscape             SpecialChar
hi def link ramlStringEscape       SpecialChar
hi def link ramlNumber             Number
hi def link ramlConstant           Constant
hi def link ramlTimestamp          Number
hi def link httpVerbs              Statement
hi def link ramlTypes              Type
hi def link ramlDelimiter          Delimiter

let b:current_syntax = "raml"

let &cpo = s:cpo_save
unlet s:cpo_save