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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dmitry Trofimov
2013-05-21 21:39:44 +02:00
parent d0156f3061 ec0d7c1b1c
commit 2672d860fa
4 changed files with 624 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/python-tests.iml
-1
View File
@@ -21,7 +21,6 @@
<orderEntry type="module" module-name="smRunner" exported="" />
<orderEntry type="module" module-name="xml" />
<orderEntry type="module" module-name="relaxng" scope="RUNTIME" />
<orderEntry type="library" name="Velocity" level="project" />
<orderEntry type="module" module-name="python-helpers" scope="RUNTIME" />
<orderEntry type="module" module-name="chronon-embedder" />
<orderEntry type="module" module-name="python-remote-interpreter" scope="TEST" />
python/src/com/jetbrains/python/PythonCommenter.java
+1 -1
View File
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable;
*/
public class PythonCommenter implements CodeDocumentationAwareCommenter, IndentedCommenter {
public String getLineCommentPrefix() {
return "# ";
return "#";
}
public String getBlockCommentPrefix() {
python/src/com/jetbrains/python/lexer/Python.flex
+7 -11
View File
@@ -71,7 +71,6 @@ TRIPLE_APOS_LITERAL = {THREE_APOS} {APOS_STRING_CHAR}* {THREE_APOS}?
%state PENDING_DOCSTRING
%state IN_DOCSTRING_OWNER
%state USUAL
%{
private int getSpaceLength(CharSequence string) {
int i = Math.max(StringUtil.lastIndexOf(string, '"', 0, string.length()), StringUtil.lastIndexOf(string, '\'', 0, string.length()));
@@ -89,18 +88,15 @@ return yylength()-i-1;
{END_OF_LINE_COMMENT} { return PyTokenTypes.END_OF_LINE_COMMENT; }
"\\" { return PyTokenTypes.BACKSLASH; }
<YYINITIAL> {
. { yypushback(1); yybegin(PENDING_DOCSTRING);}
}
<USUAL, IN_DOCSTRING_OWNER> {
<YYINITIAL, IN_DOCSTRING_OWNER> {
{LONGINTEGER} { return PyTokenTypes.INTEGER_LITERAL; }
{INTEGER} { return PyTokenTypes.INTEGER_LITERAL; }
{FLOATNUMBER} { return PyTokenTypes.FLOAT_LITERAL; }
{IMAGNUMBER} { return PyTokenTypes.IMAGINARY_LITERAL; }
{SINGLE_QUOTED_STRING} { return PyTokenTypes.SINGLE_QUOTED_STRING; }
{TRIPLE_QUOTED_STRING} { return PyTokenTypes.TRIPLE_QUOTED_STRING; }
{SINGLE_QUOTED_STRING} { if (zzCurrentPos == 0) return PyTokenTypes.DOCSTRING; return PyTokenTypes.SINGLE_QUOTED_STRING; }
{TRIPLE_QUOTED_STRING} { if (zzCurrentPos == 0) return PyTokenTypes.DOCSTRING; return PyTokenTypes.TRIPLE_QUOTED_STRING; }
"and" { return PyTokenTypes.AND_KEYWORD; }
"assert" { return PyTokenTypes.ASSERT_KEYWORD; }
@@ -188,13 +184,13 @@ return yylength()-i-1;
<PENDING_DOCSTRING> {
{SINGLE_QUOTED_STRING} { if (zzInput == YYEOF) return PyTokenTypes.DOCSTRING;
else yybegin(USUAL); return PyTokenTypes.SINGLE_QUOTED_STRING; }
else yybegin(YYINITIAL); return PyTokenTypes.SINGLE_QUOTED_STRING; }
{TRIPLE_QUOTED_STRING} { if (zzInput == YYEOF) return PyTokenTypes.DOCSTRING;
else yybegin(USUAL); return PyTokenTypes.TRIPLE_QUOTED_STRING; }
{DOCSTRING_LITERAL}[\ \t]*[\n;] { yypushback(getSpaceLength(yytext())); yybegin(USUAL); return PyTokenTypes.DOCSTRING; }
else yybegin(YYINITIAL); return PyTokenTypes.TRIPLE_QUOTED_STRING; }
{DOCSTRING_LITERAL}[\ \t]*[\n;] { yypushback(getSpaceLength(yytext())); yybegin(YYINITIAL); return PyTokenTypes.DOCSTRING; }
{DOCSTRING_LITERAL}[\ \t]*"\\" {
yypushback(getSpaceLength(yytext())); return PyTokenTypes.DOCSTRING; }
. { yypushback(1); yybegin(USUAL); }
. { yypushback(1); yybegin(YYINITIAL); }
}
python/src/com/jetbrains/python/lexer/_PythonLexer.java
+616 -555
View File
File diff suppressed because it is too large Load Diff