Merge branch 'python-fixes'

This commit is contained in:
Andrey Vlasovskikh
2013-09-17 18:59:18 +04:00
@@ -7,13 +7,15 @@ import com.jetbrains.python.PythonTokenSetContributor;
* User : ktisha
*/
public class PyDocstringTokenSetContributor extends PythonTokenSetContributor {
public static final TokenSet DOCSTRING_REFERENCE_EXPRESSIONS = TokenSet.create(PyDocstringTokenTypes.DOC_REFERENCE);
@Override
public TokenSet getExpressionTokens() {
return TokenSet.orSet(super.getExpressionTokens(), TokenSet.create(PyDocstringTokenTypes.DOC_REFERENCE));
return DOCSTRING_REFERENCE_EXPRESSIONS;
}
@Override
public TokenSet getReferenceExpressionTokens() {
return TokenSet.orSet(super.getExpressionTokens(), TokenSet.create(PyDocstringTokenTypes.DOC_REFERENCE));
return DOCSTRING_REFERENCE_EXPRESSIONS;
}
}