Mercurial > vim
annotate runtime/syntax/flexwiki.vim @ 33674:021e5bb88513 v9.0.2074
patch 9.0.2074: Completion menu may be wrong
Commit: https://github.com/vim/vim/commit/daef8c74375141974d61b85199b383017644978c
Author: Christian Brabandt <cb@256bit.org>
Date: Fri Oct 27 19:16:26 2023 +0200
patch 9.0.2074: Completion menu may be wrong
Problem: Completion menu may be wrong
Solution: Check for the original direction of the completion menu,
add more tests, make it work with 'noselect'
completion: move in right direction when filling completion_info()
When moving through the insert completion menu and switching directions,
we need to make sure we start at the correct position in the list and
move correctly forward/backwards through it, so that we do not skip
entries and the selected item points to the correct entry in the list
of completion entries generated by the completion_info() function.
The general case is this:
1) CTRL-X CTRL-N, we will traverse the list starting from
compl_first_match and then go forwards (using the cp->next pointer)
through the list (skipping the very first entry, which has the
CP_ORIGINAL_TEXT flag set (since that is the empty/non-selected entry
2) CTRL-X CTRL-P, we will traverse the list starting from
compl_first_match (which now points to the last entry). The previous
entry will have the CP_ORIGINAL_TEXT flag set, so we need to start
traversing the list from the second prev pointer.
There are in fact 2 special cases after starting the completion menu
with CTRL-X:
3) CTRL-N and then going backwards by pressing CTRL-P again.
compl_first_match will point to the same entry as in step 1 above,
but since compl_dir_foward() has been switched by pressing CTRL-P
to backwards we need to pretend to be in still in case 1 and still
traverse the list in forward direction using the cp_next pointer
4) CTRL-P and then going forwards by pressing CTRL-N again.
compl_first_match will point to the same entry as in step 2 above,
but since compl_dir_foward() has been switched by pressing CTRL-N
to forwards we need to pretend to be in still in case 2 and still
traverse the list in backward direction using the cp_prev pointer
For the 'noselect' case however, this is slightly different again. When
going backwards, we only need to go one cp_prev pointer back. And
resting of the direction works again slightly different. So we need to
take the noselect option into account when deciding in which direction
to iterate through the list of matches.
related: #13402
related: #12971
closes: #13408
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 27 Oct 2023 19:30:05 +0200 |
parents | d46f974fd69e |
children |
rev | line source |
---|---|
846 | 1 " Vim syntax file |
2 " Language: FlexWiki, http://www.flexwiki.com/ | |
3 " Maintainer: George V. Reilly <george@reilly.org> | |
4 " Home: http://www.georgevreilly.com/vim/flexwiki/ | |
5 " Other Home: http://www.vim.org/scripts/script.php?script_id=1529 | |
6 " Author: George V. Reilly | |
7 " Filenames: *.wiki | |
8 " Last Change: Wed Apr 26 11:00 PM 2006 P | |
9 " Version: 0.3 | |
10 | |
11 " Note: The horrible regexps were reverse-engineered from | |
12 " FlexWikiCore\EngineSource\Formatter.cs, with help from the Regex Analyzer | |
13 " in The Regulator, http://regulator.sourceforge.net/ .NET uses Perl-style | |
14 " regexes, which use a different syntax than Vim (fewer \s). | |
15 " The primary test case is FlexWiki\FormattingRules.wiki | |
16 | |
10048
43efa4f5a8ea
commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents:
846
diff
changeset
|
17 " quit when a syntax file was already loaded |
43efa4f5a8ea
commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents:
846
diff
changeset
|
18 if exists("b:current_syntax") |
846 | 19 finish |
20 endif | |
21 | |
22 " A WikiWord (unqualifiedWikiName) | |
23 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]*\)\)/ | |
24 " A [bracketed wiki word] | |
25 syntax match flexwikiWord /\[[[:alnum:]\s]\+\]/ | |
26 | |
27 " text: "this is a link (optional tooltip)":http://www.microsoft.com | |
28 " TODO: check URL syntax against RFC | |
29 syntax match flexwikiLink `\("[^"(]\+\((\([^)]\+\))\)\?":\)\?\(https\?\|ftp\|gopher\|telnet\|file\|notes\|ms-help\):\(\(\(//\)\|\(\\\\\)\)\+[A-Za-z0-9:#@%/;$~_?+-=.&\-\\\\]*\)` | |
30 | |
31 " text: *strong* | |
32 syntax match flexwikiBold /\(^\|\W\)\zs\*\([^ ].\{-}\)\*/ | |
33 " '''bold''' | |
34 syntax match flexwikiBold /'''\([^'].\{-}\)'''/ | |
35 | |
36 " text: _emphasis_ | |
37 syntax match flexwikiItalic /\(^\|\W\)\zs_\([^ ].\{-}\)_/ | |
38 " ''italic'' | |
39 syntax match flexwikiItalic /''\([^'].\{-}\)''/ | |
40 | |
41 " ``deemphasis`` | |
42 syntax match flexwikiDeEmphasis /``\([^`].\{-}\)``/ | |
43 | |
44 " text: @code@ | |
45 syntax match flexwikiCode /\(^\|\s\|(\|\[\)\zs@\([^@]\+\)@/ | |
46 | |
47 " text: -deleted text- | |
48 syntax match flexwikiDelText /\(^\|\s\+\)\zs-\([^ <a ]\|[^ <img ]\|[^ -].*\)-/ | |
49 | |
50 " text: +inserted text+ | |
51 syntax match flexwikiInsText /\(^\|\W\)\zs+\([^ ].\{-}\)+/ | |
52 | |
53 " text: ^superscript^ | |
54 syntax match flexwikiSuperScript /\(^\|\W\)\zs^\([^ ].\{-}\)^/ | |
55 | |
56 " text: ~subscript~ | |
57 syntax match flexwikiSubScript /\(^\|\W\)\zs\~\([^ ].\{-}\)\~/ | |
58 | |
59 " text: ??citation?? | |
60 syntax match flexwikiCitation /\(^\|\W\)\zs??\([^ ].\{-}\)??/ | |
61 | |
62 " Emoticons: must come after the Textilisms, as later rules take precedence | |
63 " over earlier ones. This match is an approximation for the ~70 distinct | |
64 " patterns that FlexWiki knows. | |
65 syntax match flexwikiEmoticons /\((.)\|:[()|$@]\|:-[DOPS()\]|$@]\|;)\|:'(\)/ | |
66 | |
67 " Aggregate all the regular text highlighting into flexwikiText | |
68 syntax cluster flexwikiText contains=flexwikiItalic,flexwikiBold,flexwikiCode,flexwikiDeEmphasis,flexwikiDelText,flexwikiInsText,flexwikiSuperScript,flexwikiSubScript,flexwikiCitation,flexwikiLink,flexwikiWord,flexwikiEmoticons | |
69 | |
32974
d46f974fd69e
runtime: Fix typos in various files
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
70 " single-line WikiProperties |
846 | 71 syntax match flexwikiSingleLineProperty /^:\?[A-Z_][_a-zA-Z0-9]\+:/ |
72 | |
32974
d46f974fd69e
runtime: Fix typos in various files
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
73 " TODO: multi-line WikiProperties |
846 | 74 |
75 " Header levels, 1-6 | |
76 syntax match flexwikiH1 /^!.*$/ | |
77 syntax match flexwikiH2 /^!!.*$/ | |
78 syntax match flexwikiH3 /^!!!.*$/ | |
79 syntax match flexwikiH4 /^!!!!.*$/ | |
80 syntax match flexwikiH5 /^!!!!!.*$/ | |
81 syntax match flexwikiH6 /^!!!!!!.*$/ | |
82 | |
83 " <hr>, horizontal rule | |
84 syntax match flexwikiHR /^----.*$/ | |
85 | |
86 " Formatting can be turned off by ""enclosing it in pairs of double quotes"" | |
87 syntax match flexwikiEscape /"".\{-}""/ | |
88 | |
89 " Tables. Each line starts and ends with '||'; each cell is separated by '||' | |
90 syntax match flexwikiTable /||/ | |
91 | |
92 " Bulleted list items start with one or tabs, followed by whitespace, then '*' | |
93 " Numeric list items start with one or tabs, followed by whitespace, then '1.' | |
94 " Eight spaces at the beginning of the line is equivalent to the leading tab. | |
95 syntax match flexwikiList /^\(\t\| \{8}\)\s*\(\*\|1\.\).*$/ contains=@flexwikiText | |
96 | |
97 " Treat all other lines that start with spaces as PRE-formatted text. | |
98 syntax match flexwikiPre /^[ \t]\+[^ \t*1].*$/ | |
99 | |
100 | |
101 " Link FlexWiki syntax items to colors | |
102 hi def link flexwikiH1 Title | |
103 hi def link flexwikiH2 flexwikiH1 | |
104 hi def link flexwikiH3 flexwikiH2 | |
105 hi def link flexwikiH4 flexwikiH3 | |
106 hi def link flexwikiH5 flexwikiH4 | |
107 hi def link flexwikiH6 flexwikiH5 | |
108 hi def link flexwikiHR flexwikiH6 | |
109 | |
110 hi def flexwikiBold term=bold cterm=bold gui=bold | |
111 hi def flexwikiItalic term=italic cterm=italic gui=italic | |
112 | |
113 hi def link flexwikiCode Statement | |
114 hi def link flexwikiWord Underlined | |
115 | |
116 hi def link flexwikiEscape Todo | |
117 hi def link flexwikiPre PreProc | |
118 hi def link flexwikiLink Underlined | |
119 hi def link flexwikiList Type | |
120 hi def link flexwikiTable Type | |
121 hi def link flexwikiEmoticons Constant | |
122 hi def link flexwikiDelText Comment | |
123 hi def link flexwikiDeEmphasis Comment | |
124 hi def link flexwikiInsText Constant | |
125 hi def link flexwikiSuperScript Constant | |
126 hi def link flexwikiSubScript Constant | |
127 hi def link flexwikiCitation Constant | |
128 | |
129 hi def link flexwikiSingleLineProperty Identifier | |
130 | |
131 let b:current_syntax="FlexWiki" | |
132 | |
133 " vim:tw=0: |