diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyDocumentationProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyDocumentationProvider.java index 12a38f4ecfeb..c661ef87a07b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyDocumentationProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyDocumentationProvider.java @@ -311,10 +311,10 @@ public class GroovyDocumentationProvider implements CodeDocumentationProvider, E if (element == null) return null; - String standard = element.getNavigationElement() instanceof PsiDocCommentOwner ? generateExternalJavaDoc(element) : null; + String standard = generateExternalJavaDoc(element); if (element instanceof GrVariable && - ((GrVariable)element).getTypeElementGroovy() == null && + ((GrVariable)element).getDeclaredType() == null && standard != null) { final String truncated = StringUtil.trimEnd(standard, BODY_HTML); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyDocumentationTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyDocumentationTest.groovy index a4a242b58ea4..f96dc190bb20 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyDocumentationTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyDocumentationTest.groovy @@ -63,11 +63,27 @@ new Gr().foo() Use bar() from class Gr instead''' } + void 'test untyped local variable'() { + doTest '''\ +def aa = 1 +aa +''', '''\ + 
Object aa

[inferred type] Integer''' + } + + void 'test implicit closure parameter'() { + doTest '''\ +List ss = [] +ss.collect { it } +''', '''\ + 

Object it

[inferred type] String''' + } + private void doTest(String text, String doc) { myFixture.configureByText '_.groovy', text def ref = myFixture.file.findReferenceAt(myFixture.editor.caretModel.offset) def provider = new GroovyDocumentationProvider() def info = provider.generateDoc(ref.resolve(), ref.element) - assert info == doc + assertEquals(doc, info) } }