Mercurial > vim
view runtime/syntax/flexwiki.vim @ 34412:b67de41ae869 v9.1.0129
patch 9.1.0129: Fix truncation of text_wrap 'wrap' virt text after EOL list char
Commit: https://github.com/vim/vim/commit/f548ae7b6357c7934411df243bc987800c9b76d1
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Sat Feb 24 10:17:11 2024 +0100
patch 9.1.0129: Fix truncation of text_wrap 'wrap' virt text after EOL list char
Problem: Virtual text with text_wrap 'wrap' was effectively being
truncated by a break conditional on the EOL list character
being added to the screen line. (BigPeet)
Solution: Remove the condition that was leading to the early break and
instead fix a similar but incorrectly written outer condition
that checks if there is more to add at the end of the screen
line. (Dylan Thacker-Smith)
Also, related:
- update comment in win_line()
- remove no longer necessary at_end_str variable in win_line()
fixes: #12725
closes: #14079
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 24 Feb 2024 10:30:05 +0100 |
parents | d46f974fd69e |
children |
line wrap: on
line source
" Vim syntax file " Language: FlexWiki, http://www.flexwiki.com/ " Maintainer: George V. Reilly <george@reilly.org> " Home: http://www.georgevreilly.com/vim/flexwiki/ " Other Home: http://www.vim.org/scripts/script.php?script_id=1529 " Author: George V. Reilly " Filenames: *.wiki " Last Change: Wed Apr 26 11:00 PM 2006 P " Version: 0.3 " Note: The horrible regexps were reverse-engineered from " FlexWikiCore\EngineSource\Formatter.cs, with help from the Regex Analyzer " in The Regulator, http://regulator.sourceforge.net/ .NET uses Perl-style " regexes, which use a different syntax than Vim (fewer \s). " The primary test case is FlexWiki\FormattingRules.wiki " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif " A WikiWord (unqualifiedWikiName) syntax match flexwikiWord /\%(_\?\([A-Z]\{2,}[a-z0-9]\+[A-Za-z0-9]*\)\|\([A-Z][a-z0-9]\+[A-Za-z0-9]*[A-Z]\+[A-Za-z0-9]*\)\)/ " A [bracketed wiki word] syntax match flexwikiWord /\[[[:alnum:]\s]\+\]/ " text: "this is a link (optional tooltip)":http://www.microsoft.com " TODO: check URL syntax against RFC syntax match flexwikiLink `\("[^"(]\+\((\([^)]\+\))\)\?":\)\?\(https\?\|ftp\|gopher\|telnet\|file\|notes\|ms-help\):\(\(\(//\)\|\(\\\\\)\)\+[A-Za-z0-9:#@%/;$~_?+-=.&\-\\\\]*\)` " text: *strong* syntax match flexwikiBold /\(^\|\W\)\zs\*\([^ ].\{-}\)\*/ " '''bold''' syntax match flexwikiBold /'''\([^'].\{-}\)'''/ " text: _emphasis_ syntax match flexwikiItalic /\(^\|\W\)\zs_\([^ ].\{-}\)_/ " ''italic'' syntax match flexwikiItalic /''\([^'].\{-}\)''/ " ``deemphasis`` syntax match flexwikiDeEmphasis /``\([^`].\{-}\)``/ " text: @code@ syntax match flexwikiCode /\(^\|\s\|(\|\[\)\zs@\([^@]\+\)@/ " text: -deleted text- syntax match flexwikiDelText /\(^\|\s\+\)\zs-\([^ <a ]\|[^ <img ]\|[^ -].*\)-/ " text: +inserted text+ syntax match flexwikiInsText /\(^\|\W\)\zs+\([^ ].\{-}\)+/ " text: ^superscript^ syntax match flexwikiSuperScript /\(^\|\W\)\zs^\([^ ].\{-}\)^/ " text: ~subscript~ syntax match flexwikiSubScript /\(^\|\W\)\zs\~\([^ ].\{-}\)\~/ " text: ??citation?? syntax match flexwikiCitation /\(^\|\W\)\zs??\([^ ].\{-}\)??/ " Emoticons: must come after the Textilisms, as later rules take precedence " over earlier ones. This match is an approximation for the ~70 distinct " patterns that FlexWiki knows. syntax match flexwikiEmoticons /\((.)\|:[()|$@]\|:-[DOPS()\]|$@]\|;)\|:'(\)/ " Aggregate all the regular text highlighting into flexwikiText syntax cluster flexwikiText contains=flexwikiItalic,flexwikiBold,flexwikiCode,flexwikiDeEmphasis,flexwikiDelText,flexwikiInsText,flexwikiSuperScript,flexwikiSubScript,flexwikiCitation,flexwikiLink,flexwikiWord,flexwikiEmoticons " single-line WikiProperties syntax match flexwikiSingleLineProperty /^:\?[A-Z_][_a-zA-Z0-9]\+:/ " TODO: multi-line WikiProperties " Header levels, 1-6 syntax match flexwikiH1 /^!.*$/ syntax match flexwikiH2 /^!!.*$/ syntax match flexwikiH3 /^!!!.*$/ syntax match flexwikiH4 /^!!!!.*$/ syntax match flexwikiH5 /^!!!!!.*$/ syntax match flexwikiH6 /^!!!!!!.*$/ " <hr>, horizontal rule syntax match flexwikiHR /^----.*$/ " Formatting can be turned off by ""enclosing it in pairs of double quotes"" syntax match flexwikiEscape /"".\{-}""/ " Tables. Each line starts and ends with '||'; each cell is separated by '||' syntax match flexwikiTable /||/ " Bulleted list items start with one or tabs, followed by whitespace, then '*' " Numeric list items start with one or tabs, followed by whitespace, then '1.' " Eight spaces at the beginning of the line is equivalent to the leading tab. syntax match flexwikiList /^\(\t\| \{8}\)\s*\(\*\|1\.\).*$/ contains=@flexwikiText " Treat all other lines that start with spaces as PRE-formatted text. syntax match flexwikiPre /^[ \t]\+[^ \t*1].*$/ " Link FlexWiki syntax items to colors hi def link flexwikiH1 Title hi def link flexwikiH2 flexwikiH1 hi def link flexwikiH3 flexwikiH2 hi def link flexwikiH4 flexwikiH3 hi def link flexwikiH5 flexwikiH4 hi def link flexwikiH6 flexwikiH5 hi def link flexwikiHR flexwikiH6 hi def flexwikiBold term=bold cterm=bold gui=bold hi def flexwikiItalic term=italic cterm=italic gui=italic hi def link flexwikiCode Statement hi def link flexwikiWord Underlined hi def link flexwikiEscape Todo hi def link flexwikiPre PreProc hi def link flexwikiLink Underlined hi def link flexwikiList Type hi def link flexwikiTable Type hi def link flexwikiEmoticons Constant hi def link flexwikiDelText Comment hi def link flexwikiDeEmphasis Comment hi def link flexwikiInsText Constant hi def link flexwikiSuperScript Constant hi def link flexwikiSubScript Constant hi def link flexwikiCitation Constant hi def link flexwikiSingleLineProperty Identifier let b:current_syntax="FlexWiki" " vim:tw=0: