MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-20820 Syntax highlightning for reST substitution fails on multi-word declarations

Browse Source
This commit is contained in:
Ekaterina Tuzova
2017-07-13 12:56:28 +03:00
parent 5c9857caf6
commit 0d74564335
3 changed files with 1197 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/python-rest/test/com/jetbrains/rest/RestLexerTest.java
+24
View File
@@ -132,6 +132,30 @@ public class RestLexerTest extends TestCase {
);
}
public void testSubstitutions() throws IOException {
doTest(".. |end-user| replace:: :term:`user`\n" +
".. |PNS ID| replace:: :term:`user`\n" +
".. |PNS.ID| replace:: :term:`user`",
"[.. , EXPLISIT_MARKUP_START]",
"[|end-user|, SUBSTITUTION]",
"[ , WHITESPACE]",
"[replace::, DIRECTIVE]",
"[ :term:`user`, LINE]",
"[\n, WHITESPACE]",
"[.. , EXPLISIT_MARKUP_START]",
"[|PNS ID|, SUBSTITUTION]",
"[ , WHITESPACE]",
"[replace::, DIRECTIVE]",
"[ :term:`user`, LINE]",
"[\n, WHITESPACE]",
"[.. , EXPLISIT_MARKUP_START]",
"[|PNS.ID|, SUBSTITUTION]",
"[ , WHITESPACE]",
"[replace::, DIRECTIVE]",
"[ :term:`user`, LINE]"
);
}
public void testInterpreted() throws IOException {
doTest(":kbd:`1`\n" +
"\n" +
python/rest/gen/com/jetbrains/rest/lexer/_RestFlexLexer.java
+1168 -1167
View File
File diff suppressed because it is too large Load Diff
python/rest/src/com/jetbrains/rest/lexer/rest.flex
+5 -5
View File
@@ -58,7 +58,7 @@ NOT_BACKQUOTE = [^`]
%%
<YYINITIAL> {
":"[^:\n\r ]([^:\n\r] | "\\:")*[^:\n\r ]":"[ `\n] { yypushback(1); return FIELD;}
":"[^:\n\r ]([^:\n\r] | "\\:")*[^:\n\r ]":"[ `\n] { yypushback(1); return FIELD;}
. { yypushback(1); yybegin(INIT); }
}
@@ -88,7 +88,7 @@ NOT_BACKQUOTE = [^`]
[0-9A-Za-z][0-9A-Za-z\-:+_]*"_""_"?{SEPARATOR} {yypushback(1); return REFERENCE_NAME;}
//"["([0-9]* | #?[0-9A-Za-z]* | "*")"]_"{SEPARATOR} {yypushback(1); return REFERENCE_NAME;}
":"[^:\n\r ]([^:\n\r] | "\\:")*[^:\n\r ]":"[`] { yypushback(1); yybegin(INIT); return FIELD;}
":"[^:\n\r ]([^:\n\r] | "\\:")*[^:\n\r ]":"[`] { yypushback(1); yybegin(INIT); return FIELD;}
{CRLF} { yybegin(IN_LINEBEGIN); return WHITESPACE;}
. { yypushback(1); yybegin(IN_LINE); }
{SPACE}+ { yybegin(IN_LINEBEGIN); return WHITESPACE;}
@@ -99,7 +99,7 @@ NOT_BACKQUOTE = [^`]
{SPACE} { return LINE;}
{CRLF} { return WHITESPACE;}
"__" { yybegin(IN_VALUE); return ANONYMOUS_HYPERLINK;}
":"[^:\n\r ]([^:\n\r] | "\\:")*[^:\n\r ]":"[ `\n] { yypushback(1); yybegin(INIT); return FIELD;}
":"[^:\n\r ]([^:\n\r] | "\\:")*[^:\n\r ]":"[ `\n] { yypushback(1); yybegin(INIT); return FIELD;}
. { yypushback(1); yybegin(INIT);}
}
@@ -164,7 +164,7 @@ NOT_BACKQUOTE = [^`]
{USUAL_TYPES}"::" { yybegin(IN_VALUE); return DIRECTIVE;}
{HIGHLIGHT_TYPES}"::" { yybegin(IN_HIGHLIGHT); return CUSTOM_DIRECTIVE;}
[0-9A-Za-z\-:]*"::" { yybegin(IN_VALUE); return CUSTOM_DIRECTIVE;}
"|"[0-9A-Za-z_]*"|" { return SUBSTITUTION;}
"|"[^|]*"|" { return SUBSTITUTION;}
[0-9A-Za-z_\[|.]+ { yybegin(IN_COMMENT); return COMMENT;}
{CRLF}{2} { yybegin(INIT); return COMMENT;}
{SPACE}*{CRLF}+ { return WHITESPACE; }
@@ -179,7 +179,7 @@ NOT_BACKQUOTE = [^`]
<IN_HIGHLIGHT> {
{SPACE}+ { return WHITESPACE;}
{CRLF} { yybegin(INIT); return WHITESPACE; }
[A-Za-z+]+{CRLF}{CRLF} { String value = yytext().toString().trim();
[A-Za-z+]+{CRLF}{CRLF} { String value = yytext().toString().trim();
if ("python".equalsIgnoreCase(value)) {
myState = 1;
yybegin(IN_INLINE);