MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 08:51:02 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed PY-8025 Enable rest, epytext and doctest highlighting in strings literal assigned to __doc__

Browse Source
This commit is contained in:
Ekaterina Tuzova
2013-02-20 15:47:57 +04:00
parent 4713082a57
commit 2d801a8dba
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/src/com/jetbrains/python/validation/DocStringAnnotator.java
View File

@@ -30,7 +30,7 @@ public class DocStringAnnotator extends PyAnnotator {
@Override @Override
public void visitPyAssignmentStatement(PyAssignmentStatement node) { public void visitPyAssignmentStatement(PyAssignmentStatement node) {
PyExpression left = node.getLeftHandSideExpression(); PyExpression left = node.getLeftHandSideExpression();
if (left != null && "__doc__".equals(left.getText())) { if (left != null && "__doc__".equals(left.getName())) {
PyExpression right = node.getAssignedValue(); PyExpression right = node.getAssignedValue();
if (right instanceof PyStringLiteralExpression) { if (right instanceof PyStringLiteralExpression) {
Annotation ann = getHolder().createInfoAnnotation(right, null); Annotation ann = getHolder().createInfoAnnotation(right, null);

10
python/testData/highlighting/docstring.py Normal file
View File

@@ -0,0 +1,10 @@
__doc__= <info descr="null">"""<info descr="null">:param</info> v: """</info>
def <info descr="null">foo</info>(<info descr="null">a</info>, <info descr="null">v</info>):
"""
<info descr="null">:param</info> a:
<info descr="null">:param</info> v:
"""
pass
foo.<info descr="null">__doc__</info>= <info descr="null">"""<info descr="null">:param</info> v: """</info>

4
python/testSrc/com/jetbrains/python/PythonHighlightingTest.java
View File

@@ -170,6 +170,10 @@ public class PythonHighlightingTest extends PyTestCase {
doTest(LanguageLevel.PYTHON32, true, false); doTest(LanguageLevel.PYTHON32, true, false);
} }
public void testDocstring() { // PY-8025
doTest(false, true);
}
public void testYieldInNestedFunction() { public void testYieldInNestedFunction() {
// highlight func declaration first, lest we get an "Extra fragment highlighted" error. // highlight func declaration first, lest we get an "Extra fragment highlighted" error.
EditorColorsManager manager = EditorColorsManager.getInstance(); EditorColorsManager manager = EditorColorsManager.getInstance();