Merge pull request #1421 from eclipse/cd_xtext_core_issue1418

[eclipse/xtext-core#1418] removed redundant superinterface from generated ca parsers
This commit is contained in:
Christian Dietrich 2020-03-16 16:28:10 +01:00 committed by GitHub
commit 85e0b14485
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 11 additions and 25 deletions

View file

@ -13,10 +13,9 @@ import java.util.Collections;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;
import org.eclipse.xtext.util.PolymorphicDispatcher;
public class PartialIndentationAwareUiTestLanguageContentAssistParser extends IndentationAwareUiTestLanguageParser implements IPartialEditingContentAssistParser {
public class PartialIndentationAwareUiTestLanguageContentAssistParser extends IndentationAwareUiTestLanguageParser {
private AbstractRule rule;

View file

@ -13,10 +13,9 @@ import java.util.Collections;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;
import org.eclipse.xtext.util.PolymorphicDispatcher;
public class PartialPartialContentAssistTestLanguageContentAssistParser extends PartialContentAssistTestLanguageParser implements IPartialEditingContentAssistParser {
public class PartialPartialContentAssistTestLanguageContentAssistParser extends PartialContentAssistTestLanguageParser {
private AbstractRule rule;

View file

@ -13,10 +13,9 @@ import java.util.Collections;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;
import org.eclipse.xtext.util.PolymorphicDispatcher;
public class PartialPartialSerializationTestLanguageContentAssistParser extends PartialSerializationTestLanguageParser implements IPartialEditingContentAssistParser {
public class PartialPartialSerializationTestLanguageContentAssistParser extends PartialSerializationTestLanguageParser {
private AbstractRule rule;

View file

@ -13,10 +13,9 @@ import java.util.Collections;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;
import org.eclipse.xtext.util.PolymorphicDispatcher;
public class PartialRenameTestLanguageContentAssistParser extends RenameTestLanguageParser implements IPartialEditingContentAssistParser {
public class PartialRenameTestLanguageContentAssistParser extends RenameTestLanguageParser {
private AbstractRule rule;

View file

@ -13,10 +13,9 @@ import java.util.Collections;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;
import org.eclipse.xtext.util.PolymorphicDispatcher;
public class PartialTestLanguageContentAssistParser extends TestLanguageParser implements IPartialEditingContentAssistParser {
public class PartialTestLanguageContentAssistParser extends TestLanguageParser {
private AbstractRule rule;

View file

@ -8,10 +8,9 @@ import java.util.Collections;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;
import org.eclipse.xtext.util.PolymorphicDispatcher;
public class PartialFileAwareTestLanguageContentAssistParser extends FileAwareTestLanguageParser implements IPartialEditingContentAssistParser {
public class PartialFileAwareTestLanguageContentAssistParser extends FileAwareTestLanguageParser {
private AbstractRule rule;

View file

@ -8,10 +8,9 @@ import java.util.Collections;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;
import org.eclipse.xtext.util.PolymorphicDispatcher;
public class PartialNestedRefsTestLanguageContentAssistParser extends NestedRefsTestLanguageParser implements IPartialEditingContentAssistParser {
public class PartialNestedRefsTestLanguageContentAssistParser extends NestedRefsTestLanguageParser {
private AbstractRule rule;

View file

@ -8,10 +8,9 @@ import java.util.Collections;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;
import org.eclipse.xtext.util.PolymorphicDispatcher;
public class PartialNoJdtTestLanguageContentAssistParser extends NoJdtTestLanguageParser implements IPartialEditingContentAssistParser {
public class PartialNoJdtTestLanguageContentAssistParser extends NoJdtTestLanguageParser {
private AbstractRule rule;

View file

@ -8,10 +8,9 @@ import java.util.Collections;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;
import org.eclipse.xtext.util.PolymorphicDispatcher;
public class PartialXtextGrammarTestLanguageContentAssistParser extends XtextGrammarTestLanguageParser implements IPartialEditingContentAssistParser {
public class PartialXtextGrammarTestLanguageContentAssistParser extends XtextGrammarTestLanguageParser {
private AbstractRule rule;

View file

@ -96,8 +96,7 @@ class CodetemplatesGeneratorFragment2 extends AbstractXtextGeneratorFragment {
}
private def StringConcatenationClient getGenPartialContentAssistParser() '''
public class «grammar.partialContentAssistParserClass.simpleName» extends «caNaming.getParserClass(grammar)» implements «
"org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser".typeRef()» {
public class «grammar.partialContentAssistParserClass.simpleName» extends «caNaming.getParserClass(grammar)» {
private «AbstractRule» rule;

View file

@ -136,9 +136,6 @@ public class CodetemplatesGeneratorFragment2 extends AbstractXtextGeneratorFragm
_builder.append(" extends ");
TypeReference _parserClass = CodetemplatesGeneratorFragment2.this.caNaming.getParserClass(CodetemplatesGeneratorFragment2.this.getGrammar());
_builder.append(_parserClass);
_builder.append(" implements ");
TypeReference _typeRef = TypeReference.typeRef("org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser");
_builder.append(_typeRef);
_builder.append(" {");
_builder.newLineIfNotEmpty();
_builder.newLine();

View file

@ -8,10 +8,9 @@ import java.util.Collections;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;
import org.eclipse.xtext.util.PolymorphicDispatcher;
public class PartialXtextContentAssistParser extends XtextParser implements IPartialEditingContentAssistParser {
public class PartialXtextContentAssistParser extends XtextParser {
private AbstractRule rule;