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

fixed PY-13677 reStructuredText substitution with underscores

Browse Source
This commit is contained in:
Ekaterina Tuzova
2014-08-25 14:03:48 +04:00
parent 8d690be3ee
commit f92afaabec
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/rest/gen/com/jetbrains/rest/lexer/_RestFlexLexer.java
+4 -4
View File
@@ -1,4 +1,4 @@
/* The following code was generated by JFlex 1.4.3 on 4/26/14 12:40 PM */
/* The following code was generated by JFlex 1.4.3 on 8/25/14 1:56 PM */
package com.jetbrains.rest.lexer;
@@ -11,8 +11,8 @@ import com.jetbrains.rest.RestTokenTypes;
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4.3
* on 4/26/14 12:40 PM from the specification file
* <tt>/Users/ignatov/src/ultimate/tools/lexer/../../community/python/rest/src/com/jetbrains/rest/lexer/rest.flex</tt>
* on 8/25/14 1:56 PM from the specification file
* <tt>/home/ktisha/IDEA/tools/lexer/../../community/python/rest/src/com/jetbrains/rest/lexer/rest.flex</tt>
*/
public class _RestFlexLexer implements FlexLexer, RestTokenTypes {
/** initial size of the lookahead buffer */
@@ -1293,7 +1293,7 @@ public class _RestFlexLexer implements FlexLexer, RestTokenTypes {
"\1\232\21\42\1\0\1\33\1\0\1\42\1\33\1\42"+
"\7\0\1\164\1\0\1\165\1\33\4\0\1\33\6\0"+
"\4\42\1\233\22\42\1\0\1\33\1\0\1\42\1\33"+
"\1\42\12\0\1\33\4\0\1\33\6\0\27\56\1\0"+
"\1\42\12\0\1\33\4\0\1\56\6\0\27\56\1\0"+
"\1\234\1\0\1\56\1\33\1\56\12\0\1\33\4\0"+
"\1\33\1\235\1\0\1\236\3\0\27\237\1\0\1\33"+
"\1\0\1\237\1\33\1\240\1\241\2\0\1\242\1\243"+
python/rest/src/com/jetbrains/rest/lexer/rest.flex
+1 -1
View File
@@ -170,7 +170,7 @@ ANY= .|\n
{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;}
"|"[0-9A-Za-z_]*"|" { return SUBSTITUTION;}
[0-9A-Za-z_\[|.]* { yybegin(IN_COMMENT); return COMMENT;}
{CRLF}{2} { yybegin(INIT); return COMMENT;}
{SPACE}*{CRLF}+ { return WHITESPACE; }
python/rest/src/com/jetbrains/rest/parsing/RestParser.java
+4 -5
View File
@@ -95,7 +95,7 @@ public class RestParser implements PsiParser {
listMarker.drop();
}
private void parseMarkup(PsiBuilder builder) {
private static void parseMarkup(PsiBuilder builder) {
PsiBuilder.Marker marker = builder.mark();
IElementType type = builder.getTokenType();
if (type == RestTokenTypes.SUBSTITUTION) {
@@ -131,19 +131,19 @@ public class RestParser implements PsiParser {
}
}
private void gotoNextWhiteSpaces(PsiBuilder builder) {
private static void gotoNextWhiteSpaces(PsiBuilder builder) {
while(!"\n".equals(builder.getTokenText()) && !(builder.getTokenType() == RestTokenTypes.TITLE) && !builder.eof() && (builder.getTokenType() != null)) {
builder.advanceLexer();
}
}
private void skipBlankLines(PsiBuilder builder) {
private static void skipBlankLines(PsiBuilder builder) {
while("\n".equals(builder.getTokenText()) && !builder.eof() && (builder.getTokenType() != null)) {
builder.advanceLexer();
}
}
private void parseDirective(PsiBuilder builder, String white, PsiBuilder.Marker marker) {
private static void parseDirective(PsiBuilder builder, String white, PsiBuilder.Marker marker) {
gotoNextWhiteSpaces(builder);
if (builder.getTokenType() != RestTokenTypes.WHITESPACE) {
builder.advanceLexer();
@@ -157,7 +157,6 @@ public class RestParser implements PsiParser {
}
else {
marker.done(RestElementTypes.DIRECTIVE_BLOCK);
return;
}
}
}