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

dollars can't be escaped in slashy strings

Browse Source
This commit is contained in:
Maxim.Medvedev
2011-12-18 23:14:13 +04:00
parent 2c6acb372b
commit cff751c721
4 changed files with 1532 additions and 1513 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/_GroovyLexer.java
+1493 -1496
View File
File diff suppressed because it is too large Load Diff
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.flex
+2 -3
View File
@@ -134,7 +134,7 @@ mIDENT_NOBUCKS = {mLETTER} ({mLETTER} | {mDIGIT})*
mSTRING_NL = {mONE_NL}
mSTRING_ESC = \\ [^] | \\ ({WHITE_SPACE})+ (\n|\r)
mREGEX_ESC = \\ "$"
mREGEX_ESC = \\ "/"
| "\\""u"{mHEX_DIGIT}{4}
| "\\" [0..3] ([0..7] ([0..7])?)?
| "\\" [4..7] ([0..7])?
@@ -142,8 +142,7 @@ mREGEX_ESC = \\ "$"
/// Regexes ////////////////////////////////////////////////////////////////
ESCAPED_REGEX_SEP = \\ "/"
mREGEX_CONTENT = ({mREGEX_ESC} | {ESCAPED_REGEX_SEP} | [^"/""$"])+
mREGEX_CONTENT = ({mREGEX_ESC} | [^"/""$"])+
mDOLLAR_SLASH_REGEX_CONTENT = ([^\/\$] | \/[^\/\$] )+
plugins/groovy/testdata/parsing/groovy/expressions/regex/regex10.test
Vendored
+24 -9
View File
@@ -1,4 +1,4 @@
'bugaga' ==~ /abc \${do "def ${a+b}} fgh$st ${frg./sdf/(5)} /
'bugaga' ==~ /abc \${do "def ${a+b}"} fgh$st ${frg./sdf/(5)} /
-----
Groovy script
Logical expression
@@ -9,21 +9,36 @@ Groovy script
PsiWhiteSpace(' ')
Compound regular expression
PsiElement(regex begin)('/')
PsiElement(regex content)('abc \${do "def ')
PsiElement(regex content)('abc \')
GString injection
PsiElement($)('$')
Closable block
PsiElement({)('{')
Parameter list
<empty list>
Additive expression
Reference expression
PsiElement(identifier)('a')
PsiElement(+)('+')
Reference expression
PsiElement(identifier)('b')
PsiErrorElement:Wrong statement
<empty list>
PsiElement(do)('do')
PsiWhiteSpace(' ')
Compound Gstring
PsiElement(Gstring begin)('"')
PsiElement(Gstring content)('def ')
GString injection
PsiElement($)('$')
Closable block
PsiElement({)('{')
Parameter list
<empty list>
Additive expression
Reference expression
PsiElement(identifier)('a')
PsiElement(+)('+')
Reference expression
PsiElement(identifier)('b')
PsiElement(})('}')
PsiElement(Gstring end)('"')
PsiElement(})('}')
PsiElement(regex content)('} fgh')
PsiElement(regex content)(' fgh')
GString injection
PsiElement($)('$')
Reference expression
plugins/groovy/testdata/parsing/groovy/expressions/regex/regex20.test
Vendored
+13 -5
View File
@@ -7,9 +7,17 @@ Groovy script
PsiWhiteSpace(' ')
Arguments
PsiElement(()('(')
Literal
GroovyASTPsiElementImpl(regex literal)
PsiElement(regex begin)('/')
PsiElement(regex content)('a\${2}')
PsiElement(regex end)('/')
Compound regular expression
PsiElement(regex begin)('/')
PsiElement(regex content)('a\')
GString injection
PsiElement($)('$')
Closable block
PsiElement({)('{')
Parameter list
<empty list>
Literal
PsiElement(Integer)('2')
PsiElement(})('}')
PsiElement(regex end)('/')
PsiElement())(')')