From 7a4e396b7fa87c5501eb43d883fddd38cf001d89 Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Wed, 16 Aug 2017 17:30:33 +0300 Subject: [PATCH] [groovy] delegate hasBlock() check from reflected to original method --- .../lang/psi/impl/synthetic/GrReflectedMethodImpl.java | 7 ++++++- .../plugins/groovy/lang/psi/GrStubAstSwitchTest.groovy | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrReflectedMethodImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrReflectedMethodImpl.java index 92be9a2b57e6..e19b2f05441d 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrReflectedMethodImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrReflectedMethodImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -329,4 +329,9 @@ public class GrReflectedMethodImpl extends LightMethodBuilder implements GrRefle public PsiElement getPrototype() { return getBaseMethod(); } + + @Override + public boolean hasBlock() { + return getBaseMethod().hasBlock(); + } } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/psi/GrStubAstSwitchTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/psi/GrStubAstSwitchTest.groovy index 89c5c434b24d..126103c778d0 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/psi/GrStubAstSwitchTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/psi/GrStubAstSwitchTest.groovy @@ -288,11 +288,11 @@ class A { void 'test do not load contents in highlighting'() { def file = fixture.tempDirFixture.createFile('classes.groovy', '''\ class C { - static void staticVoidMethod() {} + static void staticVoidMethod(a, b = 1) {} } ''') ((JavaCodeInsightTestFixtureImpl)fixture).virtualFileFilter = { it == file } - fixture.configureByText '_.groovy', 'C.staticVoidMethod()' + fixture.configureByText '_.groovy', 'C.staticVoidMethod(1)' fixture.checkHighlighting() }