From 6da5d75c7e8fc9231a166ed40507311f30523c97 Mon Sep 17 00:00:00 2001 From: danielsun1106 Date: Sun, 28 Oct 2018 18:36:47 +0800 Subject: [PATCH] GROOVY-8861: Simplify the switch for runtime groovydoc --- .../groovy/parser/antlr4/GroovydocManager.java | 2 +- .../test/resources/core/Groovydoc_01x.groovy | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovydocManager.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovydocManager.java index daac5bd5e29..c91b96ff889 100644 --- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovydocManager.java +++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovydocManager.java @@ -52,7 +52,7 @@ public class GroovydocManager { private static final String ATTACH_RUNTIME_GROOVYDOC = "groovy.attach.runtime.groovydoc"; private static final boolean ATTACHING_RUNTIME_GROOVYDOC_ENABLED; private static final String VALUE = "value"; - private static final String RUNTIME_GROOVYDOC_PATTERN = "(?s)/[*][*]\\s+(\\s+[*]\\s*)*@Groovydoc\\b.+?[*]/"; + private static final String RUNTIME_GROOVYDOC_PATTERN = "(?s)/[*][*]@\\s+.*?[*]/"; private static final GroovydocManager INSTANCE = new GroovydocManager(); diff --git a/subprojects/parser-antlr4/src/test/resources/core/Groovydoc_01x.groovy b/subprojects/parser-antlr4/src/test/resources/core/Groovydoc_01x.groovy index 9ed1eec2792..4aaa473d43e 100644 --- a/subprojects/parser-antlr4/src/test/resources/core/Groovydoc_01x.groovy +++ b/subprojects/parser-antlr4/src/test/resources/core/Groovydoc_01x.groovy @@ -16,35 +16,30 @@ * specific language governing permissions and limitations * under the License. */ -/** - * @Groovydoc +/**@ * class AA */ class AA { - /** - * @Groovydoc + /**@ * field SOME_FIELD */ public static final int SOME_FIELD = 1; - /** - * @Groovydoc + /**@ * constructor AA */ public AA() { } - /** - * @Groovydoc + /**@ * method m */ public void m() { } - /** - * @Groovydoc + /**@ * class InnerClass */ class InnerClass { @@ -54,8 +49,7 @@ class AA { } -/** - * @Groovydoc +/**@ * annotation BB */ @interface BB {