From d0adb829efc04ef6ac3aebef76ebf8201421cbb6 Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Thu, 24 May 2018 14:43:29 +0300 Subject: [PATCH] [groovy] parser: rename parser class (IDEA-191728) To match all other generated parsers, as suggested by gregsh. --- ...fParser.java => GroovyGeneratedParser.java} | 2 +- .../groovy/lang/parser/GroovyParser.java | 18 ++---------------- .../plugins/groovy/lang/parser/groovy.bnf | 2 +- 3 files changed, 4 insertions(+), 18 deletions(-) rename plugins/groovy/groovy-psi/gen/org/jetbrains/plugins/groovy/lang/parser/{GroovyBnfParser.java => GroovyGeneratedParser.java} (99%) diff --git a/plugins/groovy/groovy-psi/gen/org/jetbrains/plugins/groovy/lang/parser/GroovyBnfParser.java b/plugins/groovy/groovy-psi/gen/org/jetbrains/plugins/groovy/lang/parser/GroovyGeneratedParser.java similarity index 99% rename from plugins/groovy/groovy-psi/gen/org/jetbrains/plugins/groovy/lang/parser/GroovyBnfParser.java rename to plugins/groovy/groovy-psi/gen/org/jetbrains/plugins/groovy/lang/parser/GroovyGeneratedParser.java index 606585b4abd4..bd2261950ac8 100644 --- a/plugins/groovy/groovy-psi/gen/org/jetbrains/plugins/groovy/lang/parser/GroovyBnfParser.java +++ b/plugins/groovy/groovy-psi/gen/org/jetbrains/plugins/groovy/lang/parser/GroovyGeneratedParser.java @@ -16,7 +16,7 @@ import static com.intellij.lang.parser.GeneratedParserUtilBase.*; import static org.jetbrains.plugins.groovy.lang.parser.GroovyGeneratedParserUtils.adapt_builder_; @SuppressWarnings({"SimplifiableIfStatement", "UnusedAssignment"}) -public class GroovyBnfParser implements PsiParser, LightPsiParser { +public class GroovyGeneratedParser implements PsiParser, LightPsiParser { public ASTNode parse(IElementType t, PsiBuilder b) { parseLight(t, b); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/GroovyParser.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/GroovyParser.java index f0dbd2da55ae..62528d0fa452 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/GroovyParser.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/GroovyParser.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.plugins.groovy.lang.parser; @@ -41,7 +27,7 @@ import org.jetbrains.plugins.groovy.lang.parser.parsing.util.ParserUtils; * * @author ilyas, Dmitry.Krasilschikov */ -public class GroovyParser extends GroovyBnfParser { +public class GroovyParser extends GroovyGeneratedParser { public static final TokenSet RCURLY_ONLY = TokenSet.create(GroovyTokenTypes.mRCURLY); public static final TokenSet CASE_SECTION_END = TokenSet.create(GroovyTokenTypes.kCASE, GroovyTokenTypes.kDEFAULT, diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/groovy.bnf b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/groovy.bnf index 5e7cbf3cffdf..88d2660c81ed 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/groovy.bnf +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/groovy.bnf @@ -5,7 +5,7 @@ exact-types = 'elements' ] - parserClass = 'org.jetbrains.plugins.groovy.lang.parser.GroovyBnfParser' + parserClass = 'org.jetbrains.plugins.groovy.lang.parser.GroovyGeneratedParser' parserUtilClass = 'org.jetbrains.plugins.groovy.lang.parser.GroovyParserUtils' parserImports = [ 'static com.intellij.lang.parser.GeneratedParserUtilBase.*'