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

allow dangling lbrace in Ruby 1.9 regular expressions (RUBY-5505)

Browse Source
This commit is contained in:
Dmitry Jemerov
2009-12-18 21:02:16 +03:00
parent a3277f0efb
commit 85ced7fef5
6 changed files with 78 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RegExpSupport/src/org/intellij/lang/regexp/RegExpFile.java
+3 -2
View File
@@ -16,14 +16,15 @@
package org.intellij.lang.regexp;
import com.intellij.extapi.psi.PsiFileBase;
import com.intellij.lang.Language;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.psi.FileViewProvider;
import org.jetbrains.annotations.NotNull;
public class RegExpFile extends PsiFileBase {
public RegExpFile(FileViewProvider viewProvider) {
super(viewProvider, RegExpLanguage.INSTANCE);
public RegExpFile(FileViewProvider viewProvider, final Language language) {
super(viewProvider, language);
}
@NotNull
RegExpSupport/src/org/intellij/lang/regexp/RegExpLexer.java
+3 -3
View File
@@ -17,12 +17,12 @@ package org.intellij.lang.regexp;
import com.intellij.lexer.FlexAdapter;
class RegExpLexer extends FlexAdapter {
public class RegExpLexer extends FlexAdapter {
private static final int COMMENT_MODE = 1 << 14;
public RegExpLexer(boolean xmlSchemaMode) {
super(new _RegExLexer(xmlSchemaMode));
public RegExpLexer(boolean xmlSchemaMode, boolean allowDanglingMetacharacters) {
super(new _RegExLexer(xmlSchemaMode, allowDanglingMetacharacters));
}
public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) {
RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java
+20 -5
View File
@@ -18,13 +18,19 @@ package org.intellij.lang.regexp;
import com.intellij.lang.ASTNode;
import com.intellij.lang.PsiBuilder;
import com.intellij.lang.PsiParser;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.StringEscapesTokenTypes;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@SuppressWarnings({ "RedundantIfStatement" })
class RegExpParser implements PsiParser {
public class RegExpParser implements PsiParser {
private boolean myAllowDanglingMetacharacters;
public void setAllowDanglingMetacharacters(boolean allowDanglingMetacharacters) {
myAllowDanglingMetacharacters = allowDanglingMetacharacters;
}
@NotNull
public ASTNode parse(IElementType root, PsiBuilder builder) {
// builder.setDebugMode(true);
@@ -123,6 +129,10 @@ class RegExpParser implements PsiParser {
if (builder.getTokenType() == RegExpTT.LBRACE) {
builder.advanceLexer();
if (builder.getTokenType() != RegExpTT.NUMBER && myAllowDanglingMetacharacters) {
marker.done(RegExpTT.CHARACTER);
return true;
}
checkMatches(builder, RegExpTT.NUMBER, "Number expected");
if (builder.getTokenType() == RegExpTT.RBRACE) {
builder.advanceLexer();
@@ -157,7 +167,7 @@ class RegExpParser implements PsiParser {
return true;
}
private void parseQuantifierType(PsiBuilder builder) {
private static void parseQuantifierType(PsiBuilder builder) {
if (builder.getTokenType() == RegExpTT.PLUS) {
builder.advanceLexer();
} else if (builder.getTokenType() == RegExpTT.QUEST) {
@@ -344,14 +354,19 @@ class RegExpParser implements PsiParser {
} else if (type == RegExpTT.CLASS_BEGIN) {
marker.drop();
return parseClass(builder);
} else {
}
else if (type == RegExpTT.LBRACE && myAllowDanglingMetacharacters) {
builder.advanceLexer();
marker.done(RegExpElementTypes.CHAR);
}
else {
marker.drop();
return null;
}
return marker;
}
private void parseProperty(PsiBuilder builder) {
private static void parseProperty(PsiBuilder builder) {
checkMatches(builder, RegExpTT.PROPERTY, "'\\p' expected");
checkMatches(builder, RegExpTT.LBRACE, "Character category expected");
RegExpSupport/src/org/intellij/lang/regexp/RegExpParserDefinition.java
+4 -4
View File
@@ -34,9 +34,9 @@ import org.jetbrains.annotations.NotNull;
public class RegExpParserDefinition implements ParserDefinition {
private static final TokenSet COMMENT_TOKENS = TokenSet.create(RegExpTT.COMMENT);
@NotNull
@NotNull
public Lexer createLexer(Project project) {
return new RegExpLexer(false);
return new RegExpLexer(false, false);
}
public PsiParser createParser(Project project) {
@@ -86,7 +86,7 @@ public class RegExpParserDefinition implements ParserDefinition {
return new RegExpSetOptionsImpl(node);
} else if (type == RegExpElementTypes.OPTIONS) {
return new RegExpOptionsImpl(node);
} else if (type == RegExpElementTypes.BACKREF) {
} else if (type == RegExpElementTypes.BACKREF) {
return new RegExpBackrefImpl(node);
} else if (type == RegExpElementTypes.CLOSURE) {
return new RegExpClosureImpl(node);
@@ -101,7 +101,7 @@ public class RegExpParserDefinition implements ParserDefinition {
}
public PsiFile createFile(FileViewProvider viewProvider) {
return new RegExpFile(viewProvider);
return new RegExpFile(viewProvider, RegExpLanguage.INSTANCE);
}
public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) {
RegExpSupport/src/org/intellij/lang/regexp/_RegExLexer.java
+37 -36
View File
@@ -1,26 +1,13 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* The following code was generated by JFlex 1.4.1 on 18.12.09 20:27 */
/* It's an automatically generated code. Do not modify it. */
package org.intellij.lang.regexp;
import com.intellij.lexer.FlexLexer;
import com.intellij.psi.tree.IElementType;
import java.util.LinkedList;
import com.intellij.psi.StringEscapesTokenTypes;
import com.intellij.psi.tree.IElementType;
import java.util.LinkedList;
// IDEADEV-11055
@SuppressWarnings({ "ALL", "SameParameterValue", "WeakerAccess", "SameReturnValue", "RedundantThrows", "UnusedDeclaration", "UnusedDeclaration" })
@@ -28,8 +15,8 @@ import com.intellij.psi.StringEscapesTokenTypes;
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4.1
* on 04.11.09 17:54 from the specification file
* <tt>RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex</tt>
* on 18.12.09 20:27 from the specification file
* <tt>C:/JetBrains/IDEA/tools/lexer/../../community/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex</tt>
*/
class _RegExLexer implements FlexLexer {
/** initial size of the lookahead buffer */
@@ -352,9 +339,12 @@ class _RegExLexer implements FlexLexer {
// as well, but is currently unfinished as it requires to tweak more places than just the lexer.
private boolean xmlSchemaMode;
_RegExLexer(boolean xmlSchemaMode) {
private boolean allowDanglingMetacharacters;
_RegExLexer(boolean xmlSchemaMode, boolean allowDanglingMetacharacters) {
this((java.io.Reader)null);
this.xmlSchemaMode = xmlSchemaMode;
this.xmlSchemaMode = xmlSchemaMode;
this.allowDanglingMetacharacters = allowDanglingMetacharacters;
}
private void yypushstate(int state) {
@@ -431,7 +421,14 @@ class _RegExLexer implements FlexLexer {
// For Demetra compatibility
public void reset(CharSequence buffer, int initialState){
reset(buffer, 0, buffer.length(), initialState);
zzBuffer = buffer;
zzBufferArray = null;
zzCurrentPos = zzMarkedPos = zzStartRead = 0;
zzPushbackPos = 0;
zzAtEOF = false;
zzAtBOL = true;
zzEndRead = buffer.length();
yybegin(initialState);
}
/**
@@ -591,7 +588,7 @@ class _RegExLexer implements FlexLexer {
while (true) {
if (zzCurrentPosL < zzEndReadL)
zzInput = zzBufferL.charAt(zzCurrentPosL++);
zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++]:zzBufferL.charAt(zzCurrentPosL++);
else if (zzAtEOF) {
zzInput = YYEOF;
break zzForAction;
@@ -613,7 +610,7 @@ class _RegExLexer implements FlexLexer {
break zzForAction;
}
else {
zzInput = zzBufferL.charAt(zzCurrentPosL++);
zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++]:zzBufferL.charAt(zzCurrentPosL++);
}
}
int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
@@ -840,45 +837,49 @@ class _RegExLexer implements FlexLexer {
{ return RegExpTT.HEX_CHAR;
}
case 111: break;
case 20:
{ return RegExpTT.BAD_CHARACTER;
}
case 112: break;
case 5:
{ return RegExpTT.GROUP_BEGIN;
}
case 113: break;
case 112: break;
case 8:
{ yypushstate(CLASS2); return RegExpTT.CLASS_BEGIN;
}
case 114: break;
case 113: break;
case 52:
{ return RegExpTT.NON_CAPT_GROUP;
}
case 115: break;
case 114: break;
case 9:
{ return StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN;
}
case 116: break;
case 115: break;
case 48:
{ return RegExpTT.BAD_HEX_VALUE;
}
case 117: break;
case 116: break;
case 2:
{ yypopstate(); return RegExpTT.COMMENT;
}
case 118: break;
case 117: break;
case 47:
{ yypushstate(QUOTED); return RegExpTT.QUOTE_BEGIN;
}
case 119: break;
case 118: break;
case 26:
{ yybegin(CLASS2); return RegExpTT.CHARACTER;
}
case 120: break;
case 119: break;
case 15:
{ return RegExpTT.PLUS;
}
case 120: break;
case 20:
{ if (allowDanglingMetacharacters) {
yypopstate(); yypushback(1);
} else {
return RegExpTT.BAD_CHARACTER;
}
}
case 121: break;
case 31:
{ yybegin(YYINITIAL); return RegExpTT.BAD_CHARACTER;
RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
+11 -3
View File
@@ -26,9 +26,12 @@ import com.intellij.psi.StringEscapesTokenTypes;
// as well, but is currently unfinished as it requires to tweak more places than just the lexer.
private boolean xmlSchemaMode;
_RegExLexer(boolean xmlSchemaMode) {
private boolean allowDanglingMetacharacters;
_RegExLexer(boolean xmlSchemaMode, boolean allowDanglingMetacharacters) {
this((java.io.Reader)null);
this.xmlSchemaMode = xmlSchemaMode;
this.xmlSchemaMode = xmlSchemaMode;
this.allowDanglingMetacharacters = allowDanglingMetacharacters;
}
private void yypushstate(int state) {
@@ -157,7 +160,12 @@ HEX_CHAR=[0-9a-fA-F]
"," { return RegExpTT.COMMA; }
{RBRACE} { yypopstate(); return RegExpTT.RBRACE; }
{ANY} { return RegExpTT.BAD_CHARACTER; }
{ANY} { if (allowDanglingMetacharacters) {
yypopstate(); yypushback(1);
} else {
return RegExpTT.BAD_CHARACTER;
}
}
}
"-" { return RegExpTT.MINUS; }