This commit is contained in:
Adam Stankiewicz
2022-03-12 15:46:18 +01:00
parent 83422e0a1f
commit a4f98d2a9e
12 changed files with 153 additions and 68 deletions

View File

@@ -183,8 +183,9 @@ syntax region juliaLetBlock matchgroup=juliaBlKeyword start="\<let\>" end="\<e
syntax region juliaDoBlock matchgroup=juliaBlKeyword start="\<do\>" end="\<end\>" contains=@juliaExpressions fold
syntax region juliaModuleBlock matchgroup=juliaBlKeyword start="\<\%(bare\)\?module\>" end="\<end\>" contains=@juliaExpressions fold
syntax region juliaExceptionBlock matchgroup=juliaException start="\<try\>" end="\<end\>" contains=@juliaExpressions,juliaCatchBlock,juliaFinallyBlock fold
syntax region juliaCatchBlock matchgroup=juliaException transparent contained start="\<catch\>" end="\<end\>"me=s-1 contains=@juliaExpressions,juliaFinallyBlock
syntax region juliaFinallyBlock matchgroup=juliaException transparent contained start="\<finally\>" end="\<end\>"me=s-1 contains=@juliaExpressions
syntax region juliaCatchBlock matchgroup=juliaException transparent contained start="\<catch\>" end="\<end\>"me=s-1 contains=@juliaExpressions,juliaTryElseBlock,juliaFinallyBlock
syntax region juliaTryElseBlock matchgroup=juliaException transparent contained start="\<else\>" end="\<end\>"me=s-1 contains=@juliaExpressions,juliaFinallyBlock
syntax region juliaFinallyBlock matchgroup=juliaException transparent contained start="\<finally\>" end="\<end\>"me=s-1 contains=@juliaExpressions,juliaCatchBlock
syntax region juliaAbstractBlock matchgroup=juliaBlKeyword start="\<abstract\s\+type\>" end="\<end\>" fold contains=@juliaExpressions,juliaStructR
syntax region juliaPrimitiveBlock matchgroup=juliaBlKeyword start="\<primitive\s\+type\>" end="\<end\>" fold contains=@juliaExpressions,juliaStructR

View File

@@ -129,7 +129,6 @@ syntax keyword smt2Builtin
\ rotate_left
\ rotate_right
\ sat
\ sat
\ select
\ sign_extend
\ store
@@ -137,7 +136,6 @@ syntax keyword smt2Builtin
\ to_real
\ true
\ unsat
\ unsat
\ xor
\ zero_extend
syntax match smt2Builtin "\m\C[\^\~]"

View File

@@ -247,7 +247,7 @@ syn keyword solMethod delete new var return import
syn region solMethodParens start='(' end=')' contains=solString,solConstant,solNumber,solFuncCall,solTypeCast,solMethod,solComma,solOperator contained transparent
syn keyword solMethod nextgroup=solMethodParens skipwhite skipempty
\ blockhash require revert assert keccak256 sha256
\ ripemd160 ecrecover addmod mullmod selfdestruct
\ ripemd160 ecrecover addmod mulmod selfdestruct
hi def link solMethod Special

View File

@@ -22,43 +22,41 @@ syntax match svelteComponentName containedin=htmlTagN '\v\C<[a-z0-9]+(-[a-z0-9]+
syntax match svelteComponentName containedin=htmlTagN '\vsvelte:\w*'
" Syntax for vim-svelte-theme
syntax match htmlAttr '\v(\S|\<)@<![^\/\<\>[:blank:]]+' containedin=htmlTag
syntax match htmlAttr '\v(\S|\<)@<![^\/\<\>[:blank:]]+'
\ containedin=htmlTag
\ contains=htmlString,svelteValue,htmlArg
syntax match htmlAttrEqual '\v\=' containedin=htmlAttr
syntax match svelteAttr
\ '\v(\S)@<!(on|bind|use|in|out|transition|animate|class):[^\=\>[:blank:]]+(\=\"[^"]*\"|\=\{[^}]*\})?'
syntax match svelteAttr
\ '\(\S\)\@<!\w\+:[^=>[:blank:]]\+\(="[^"]*"\|={[^}]*}\)\?'
\ containedin=htmlTag
\ contains=svelteKey,svelteValue
syntax match svelteKey contained '\v(on|bind|use|in|out|transition|animate|class):[^\=\>[:blank:]]+'
syntax match svelteValue contained '\v\{[^}]*\}'
syntax match svelteValue contained '{[^}]*}'
syntax match svelteKey contained '\w\+:[^=>[:blank:]]\+'
syntax region svelteExpression
\ containedin=htmlH.*,htmlItalic
\ matchgroup=svelteBrace
\ transparent
\ start="{"
\ end="}\(}\)\@!"
\ end="}\(}\|;\)\@!"
" Multiple lines expressions are supposed to end with '}}'
syntax region svelteExpression
\ containedin=svelteValue,htmlValue,htmlAttr
\ contains=@simpleJavascriptExpression
\ matchgroup=svelteBrace
\ start="{"
\ end="\(}\)\@<=}"
syntax region svelteExpression
\ containedin=htmlSvelteTemplate,svelteValue,htmlString,htmlValue,htmlArg,htmlTag
\ containedin=htmlSvelteTemplate,svelteValue,htmlString,htmlArg,htmlTag,htmlAttr,htmlValue,htmlAttr
\ contains=@simpleJavascriptExpression,svelteAtTags
\ matchgroup=svelteBrace
\ transparent
\ start="{"
\ end="}\(}\)\@!"
\ end="}\(}\|;\)\@!"
\ oneline
syntax region svelteExpression
\ containedin=htmlTag
\ contains=@simpleJavascriptExpression,svelteAtTags,svelteShortProp
\ matchgroup=svelteBrace
\ transparent
\ start="{"
\ end="}\(}\)\@!"
syntax match svelteAtTags '\v\@(html|debug)'
syntax match svelteShortProp '\v<\w+>'
syntax match svelteAtTags '@\(html\|debug\)'
syntax region svelteBlockBody
\ containedin=htmlSvelteTemplate,htmlLink
@@ -101,7 +99,9 @@ syntax region javaScriptTemplateExpression
syntax match javaScriptNumber '\v<-?\d+L?>|0[xX][0-9a-fA-F]+>' contained
syntax match javaScriptOperator '[-!|&+<>=%*~^]' contained
syntax match javaScriptOperator '\v(*)@<!/(/|*)@!' contained
syntax keyword javaScriptOperator delete instanceof typeof void new in of contained
syntax keyword javaScriptOperator contained
\ delete instanceof typeof void new in of const let var
\ return function
highlight default link svelteAttr htmlTag
if s:highlight_svelte_attr
@@ -112,7 +112,9 @@ else
highlight default link svelteValue String
endif
highlight default link svelteExpression None
highlight default link svelteBrace Type
highlight default link svelteAtTags Type
highlight default link svelteBlockKeyword Statement
highlight default link svelteComponentName htmlTagName
highlight default link javaScriptTemplateString String
@@ -122,6 +124,5 @@ highlight default link javaScriptNumber Constant
highlight default link javaScriptOperator Operator
highlight default link svelteAttr htmlTag
highlight default link svelteAttrEqual htmlTag
highlight default link svelteShortProp htmlValue
"}}}
" vim: fdm=marker

View File

@@ -192,7 +192,7 @@ syn keyword swayConfigDrawingMarksKeyword show_marks contained
syn match swayConfigDrawingMarks /^\s*show_marks\s\+\(yes\|no\)\s\?$/ contains=swayConfigFocusWrappingType,swayConfigDrawingMarksKeyword
" Group mode/bar
syn keyword swayConfigBlockKeyword mode bar colors i3bar_command status_command position exec mode hidden_state modifier id position output background statusline tray_output tray_padding separator separator_symbol workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained
syn keyword swayConfigBlockKeyword set input mode bar colors i3bar_command status_command position exec mode hidden_state modifier id position output background statusline tray_output tray_padding separator separator_symbol workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained
syn region swayConfigBlock start=+.*s\?{$+ end=+^}$+ contains=swayConfigBlockKeyword,swayConfigString,swayConfigBind,swayConfigComment,swayConfigFont,swayConfigFocusWrappingType,swayConfigColor,swayConfigVariable transparent keepend extend
" Line continuation
@@ -202,6 +202,10 @@ syn region swayConfigLineCont start=/^.*\\$/ end=/^.*$/ contains=swayConfigBlock
syn keyword swayConfigInclude include contained
syn match swayConfigFile /^include\s\(\~\?\/.*$\|\.\{0,2}\/.*$\)/ contains=swayConfigInclude
" xwayland
syn keyword swayConfigXwaylandKeyword xwayland contained
syn match swayConfigXwaylandModifier /^\s*xwayland\s\+\(enable\|disable\|force\)\s\?$/ contains=swayConfigXwaylandKeyword
" Define the highlighting.
let b:current_syntax = "swayconfig"
hi! def link swayConfigError Error
@@ -281,5 +285,6 @@ hi! def link swayConfigFloatingModifier Identifier
hi! def link swayConfigFloatingMouseAction Type
hi! def link swayConfigFocusKeyword Type
hi! def link swayConfigFocusType Identifier
hi! def link swayConfigXwaylandKeyword Identifier
hi! def link swayConfigXwaylandModifier Type

View File

@@ -140,10 +140,12 @@ syntax keyword swiftKeywords
\ init
\ inout
\ internal
\ isolated
\ lazy
\ let
\ mutating
\ nil
\ nonisolated
\ nonmutating
\ open
\ operator
@@ -193,14 +195,22 @@ syntax keyword swiftAttributes
\ @_exported
\ @_implementationOnly
\ @_silgen_name
\ @AppStorage
\ @assignment
\ @autoclosure
\ @available
\ @Binding
\ @convention
\ @discardableResult
\ @Environment
\ @EnvironmentObject
\ @escaping
\ @exported
\ @FetchRequest
\ @FocusedBinding
\ @FocusedValue
\ @frozen
\ @GestureState
\ @IBAction
\ @IBDesignable
\ @IBInspectable
@@ -208,21 +218,29 @@ syntax keyword swiftAttributes
\ @inlinable
\ @main
\ @MainActor
\ @Namespace
\ @noescape
\ @nonobjc
\ @noreturn
\ @NSApplicationDelegateAdaptor
\ @NSApplicationMain
\ @NSCopying
\ @NSManaged
\ @objc
\ @ObservedObject
\ @preconcurrency
\ @propertyWrapper
\ @Published
\ @resultBuilder
\ @ScaledMetric
\ @SceneStorage
\ @Sendable
\ @State
\ @StateObject
\ @testable
\ @UIApplicationDelegateAdaptor
\ @UIApplicationMain
\ @usableFromInline
\ @warn_unused_result
syntax keyword swiftConditionStatement
\ #available

View File

@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'tmux', 'syntax/tmux.vim')
endif
" Language: tmux(1) configuration file
" Version: 3.3-rc (git-85ef7359)
" Version: 3.3-rc (git-ee3f1d25)
" URL: https://github.com/ericpruitt/tmux.vim/
" Maintainer: Eric Pruitt <eric.pruitt@gmail.com>
" License: 2-Clause BSD (http://opensource.org/licenses/BSD-2-Clause)
@@ -88,13 +88,13 @@ syn keyword tmuxOptions
\ pane-border-indicators pane-border-lines pane-border-status
\ pane-border-style pane-colours popup-border-lines popup-border-style
\ popup-style prefix prefix2 prompt-history-limit remain-on-exit
\ renumber-windows repeat-time set-clipboard set-titles set-titles-string
\ silence-action status status-bg status-fg status-format status-interval
\ status-justify status-keys status-left status-left-length
\ status-left-style status-position status-right status-right-length
\ status-right-style status-style synchronize-panes terminal-features
\ terminal-overrides update-environment user-keys visual-activity
\ visual-bell visual-silence window-active-style window-size
\ remain-on-exit-format renumber-windows repeat-time set-clipboard
\ set-titles set-titles-string silence-action status status-bg status-fg
\ status-format status-interval status-justify status-keys status-left
\ status-left-length status-left-style status-position status-right
\ status-right-length status-right-style status-style synchronize-panes
\ terminal-features terminal-overrides update-environment user-keys
\ visual-activity visual-bell visual-silence window-active-style window-size
\ window-status-activity-style window-status-bell-style
\ window-status-current-format window-status-current-style
\ window-status-format window-status-last-style window-status-separator

View File

@@ -203,6 +203,8 @@ let s:zig_syntax_keywords = {
\ , "@floor"
\ , "@ceil"
\ , "@trunc"
\ , "@wasmMemorySize"
\ , "@wasmMemoryGrow"
\ , "@round"]
\ }