From 8ae978c81646034638b4f6b65764375d26d0a824 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 26 Apr 2010 22:02:48 +0400 Subject: [PATCH] enable showing inferred return types for methods in quick doc; fix quick doc tests --- .../com/jetbrains/python/PythonDocumentationProvider.java | 6 ++---- python/testData/quickdoc/CallFunc.html | 2 +- python/testData/quickdoc/DirectFunc.html | 2 +- python/testData/quickdoc/InheritedMethod.html | 2 +- python/testData/quickdoc/Method.html | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/python/src/com/jetbrains/python/PythonDocumentationProvider.java b/python/src/com/jetbrains/python/PythonDocumentationProvider.java index 35a5ebc13245..4e312d886a5b 100644 --- a/python/src/com/jetbrains/python/PythonDocumentationProvider.java +++ b/python/src/com/jetbrains/python/PythonDocumentationProvider.java @@ -86,10 +86,8 @@ public class PythonDocumentationProvider extends QuickDocumentationProvider { } cat.add("def ").addWith(func_name_wrapper, $(fun.getName())); cat.add(escaper.apply(PyUtil.getReadableRepr(fun.getParameterList(), false))); - if (((ApplicationEx)ApplicationManager.getApplication()).isInternal()) { - final PyType returnType = fun.getReturnType(); - cat.add("
Inferred return type: ").add(returnType == null ? "unknown" : returnType.getName()); - } + final PyType returnType = fun.getReturnType(); + cat.add(escaper.apply("\nInferred return type: ")).add(returnType == null ? "unknown" : returnType.getName()); return cat; } diff --git a/python/testData/quickdoc/CallFunc.html b/python/testData/quickdoc/CallFunc.html index 77d22808f803..745d042a0a82 100644 --- a/python/testData/quickdoc/CallFunc.html +++ b/python/testData/quickdoc/CallFunc.html @@ -1 +1 @@ -def foo()
Doc of foo. +def foo()
Inferred return type: None
Doc of foo. diff --git a/python/testData/quickdoc/DirectFunc.html b/python/testData/quickdoc/DirectFunc.html index 77d22808f803..745d042a0a82 100644 --- a/python/testData/quickdoc/DirectFunc.html +++ b/python/testData/quickdoc/DirectFunc.html @@ -1 +1 @@ -def foo()
Doc of foo. +def foo()
Inferred return type: None
Doc of foo. diff --git a/python/testData/quickdoc/InheritedMethod.html b/python/testData/quickdoc/InheritedMethod.html index 1eeee7a0216f..c4dafe8c8046 100644 --- a/python/testData/quickdoc/InheritedMethod.html +++ b/python/testData/quickdoc/InheritedMethod.html @@ -1 +1 @@ -class B
def foo(self)

Documentation is missing. The following if copied from A.foo.

Doc from A.foo. +class B
def foo(self)
Inferred return type: None

Documentation is missing. The following if copied from A.foo.

Doc from A.foo. diff --git a/python/testData/quickdoc/Method.html b/python/testData/quickdoc/Method.html index 5135547035d0..db82f0c2042c 100644 --- a/python/testData/quickdoc/Method.html +++ b/python/testData/quickdoc/Method.html @@ -1 +1 @@ -class Foo
@deco
def meth(self)

Doc of meth.
 +class Foo
@deco
def meth(self)
Inferred return type: None

Doc of meth.