added a syntactic element in test language for recreating the problem

eclipse · May 17, 2024 · 175b264 · 175b264
1 parent a1ae221
commit 175b264
Show file tree

Hide file tree

Showing 24 changed files with 15,339 additions and 13,582 deletions.
diff --git a/...xt/xbase/testlanguages/ide/contentassist/antlr/JvmGenericTypeValidatorTestLangParser.java b/...xt/xbase/testlanguages/ide/contentassist/antlr/JvmGenericTypeValidatorTestLangParser.java
@@ -91,6 +91,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
 			builder.put(grammarAccess.getMyClassWithSuperTypesAccess().getGroup(), "rule__MyClassWithSuperTypes__Group__0");
 			builder.put(grammarAccess.getMyClassWithSuperTypesAccess().getGroup_2(), "rule__MyClassWithSuperTypes__Group_2__0");
 			builder.put(grammarAccess.getMyClassWithSuperTypesAccess().getGroup_2_2(), "rule__MyClassWithSuperTypes__Group_2_2__0");
+			builder.put(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getGroup(), "rule__MyClassWithWrongAdditionalInferredInterface__Group__0");
 			builder.put(grammarAccess.getMyMemberAccess().getGroup_0(), "rule__MyMember__Group_0__0");
 			builder.put(grammarAccess.getMyMemberAccess().getGroup_0_3(), "rule__MyMember__Group_0_3__0");
 			builder.put(grammarAccess.getMyMemberAccess().getGroup_0_3_1(), "rule__MyMember__Group_0_3_1__0");
@@ -300,6 +301,8 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
 			builder.put(grammarAccess.getMyClassWithSuperTypesAccess().getNameAssignment_1(), "rule__MyClassWithSuperTypes__NameAssignment_1");
 			builder.put(grammarAccess.getMyClassWithSuperTypesAccess().getSuperTypesAssignment_2_1(), "rule__MyClassWithSuperTypes__SuperTypesAssignment_2_1");
 			builder.put(grammarAccess.getMyClassWithSuperTypesAccess().getSuperTypesAssignment_2_2_1(), "rule__MyClassWithSuperTypes__SuperTypesAssignment_2_2_1");
+			builder.put(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getNameAssignment_1(), "rule__MyClassWithWrongAdditionalInferredInterface__NameAssignment_1");
+			builder.put(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getMembersAssignment_3(), "rule__MyClassWithWrongAdditionalInferredInterface__MembersAssignment_3");
 			builder.put(grammarAccess.getMyMemberAccess().getParametersAssignment_0_3_0(), "rule__MyMember__ParametersAssignment_0_3_0");
 			builder.put(grammarAccess.getMyMemberAccess().getParametersAssignment_0_3_1_1(), "rule__MyMember__ParametersAssignment_0_3_1_1");
 			builder.put(grammarAccess.getMyMemberAccess().getExceptionsAssignment_0_5_1(), "rule__MyMember__ExceptionsAssignment_0_5_1");

diff --git a/.../testlanguages/ide/contentassist/antlr/internal/InternalJvmGenericTypeValidatorTestLang.g b/.../testlanguages/ide/contentassist/antlr/internal/InternalJvmGenericTypeValidatorTestLang.g
@@ -180,6 +180,31 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+// Entry rule entryRuleMyClassWithWrongAdditionalInferredInterface
+entryRuleMyClassWithWrongAdditionalInferredInterface
+:
+{ before(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceRule()); }
+	 ruleMyClassWithWrongAdditionalInferredInterface
+{ after(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceRule()); } 
+	 EOF 
+;
+
+// Rule MyClassWithWrongAdditionalInferredInterface
+ruleMyClassWithWrongAdditionalInferredInterface 
+	@init {
+		int stackSize = keepStackSize();
+	}
+	:
+	(
+		{ before(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getGroup()); }
+		(rule__MyClassWithWrongAdditionalInferredInterface__Group__0)
+		{ after(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getGroup()); }
+	)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 // Entry rule entryRuleMyMember
 entryRuleMyMember
 :
@@ -2174,6 +2199,12 @@ rule__MyType__Alternatives
 		ruleMyClassWithSuperTypes
 		{ after(grammarAccess.getMyTypeAccess().getMyClassWithSuperTypesParserRuleCall_2()); }
 	)
+	|
+	(
+		{ before(grammarAccess.getMyTypeAccess().getMyClassWithWrongAdditionalInferredInterfaceParserRuleCall_3()); }
+		ruleMyClassWithWrongAdditionalInferredInterface
+		{ after(grammarAccess.getMyTypeAccess().getMyClassWithWrongAdditionalInferredInterfaceParserRuleCall_3()); }
+	)
 ;
 finally {
 	restoreStackSize(stackSize);
@@ -4585,6 +4616,141 @@ finally {
 }
 
 
+rule__MyClassWithWrongAdditionalInferredInterface__Group__0
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	rule__MyClassWithWrongAdditionalInferredInterface__Group__0__Impl
+	rule__MyClassWithWrongAdditionalInferredInterface__Group__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MyClassWithWrongAdditionalInferredInterface__Group__0__Impl
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+(
+	{ before(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getClassWithWrongInferredInterfaceKeyword_0()); }
+	'classWithWrongInferredInterface'
+	{ after(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getClassWithWrongInferredInterfaceKeyword_0()); }
+)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MyClassWithWrongAdditionalInferredInterface__Group__1
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	rule__MyClassWithWrongAdditionalInferredInterface__Group__1__Impl
+	rule__MyClassWithWrongAdditionalInferredInterface__Group__2
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MyClassWithWrongAdditionalInferredInterface__Group__1__Impl
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+(
+	{ before(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getNameAssignment_1()); }
+	(rule__MyClassWithWrongAdditionalInferredInterface__NameAssignment_1)
+	{ after(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getNameAssignment_1()); }
+)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MyClassWithWrongAdditionalInferredInterface__Group__2
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	rule__MyClassWithWrongAdditionalInferredInterface__Group__2__Impl
+	rule__MyClassWithWrongAdditionalInferredInterface__Group__3
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MyClassWithWrongAdditionalInferredInterface__Group__2__Impl
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+(
+	{ before(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getLeftCurlyBracketKeyword_2()); }
+	'{'
+	{ after(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getLeftCurlyBracketKeyword_2()); }
+)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MyClassWithWrongAdditionalInferredInterface__Group__3
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	rule__MyClassWithWrongAdditionalInferredInterface__Group__3__Impl
+	rule__MyClassWithWrongAdditionalInferredInterface__Group__4
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MyClassWithWrongAdditionalInferredInterface__Group__3__Impl
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+(
+	{ before(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getMembersAssignment_3()); }
+	(rule__MyClassWithWrongAdditionalInferredInterface__MembersAssignment_3)*
+	{ after(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getMembersAssignment_3()); }
+)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MyClassWithWrongAdditionalInferredInterface__Group__4
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	rule__MyClassWithWrongAdditionalInferredInterface__Group__4__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MyClassWithWrongAdditionalInferredInterface__Group__4__Impl
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+(
+	{ before(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getRightCurlyBracketKeyword_4()); }
+	'}'
+	{ after(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getRightCurlyBracketKeyword_4()); }
+)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
 rule__MyMember__Group_0__0
 	@init {
 		int stackSize = keepStackSize();
@@ -17865,6 +18031,36 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+rule__MyClassWithWrongAdditionalInferredInterface__NameAssignment_1
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	(
+		{ before(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getNameValidIDParserRuleCall_1_0()); }
+		ruleValidID
+		{ after(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getNameValidIDParserRuleCall_1_0()); }
+	)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MyClassWithWrongAdditionalInferredInterface__MembersAssignment_3
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	(
+		{ before(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getMembersMyMemberParserRuleCall_3_0()); }
+		ruleMyMember
+		{ after(grammarAccess.getMyClassWithWrongAdditionalInferredInterfaceAccess().getMembersMyMemberParserRuleCall_3_0()); }
+	)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 rule__MyMember__ParametersAssignment_0_3_0
 	@init {
 		int stackSize = keepStackSize();

diff --git a/...languages/ide/contentassist/antlr/internal/InternalJvmGenericTypeValidatorTestLang.tokens b/...languages/ide/contentassist/antlr/internal/InternalJvmGenericTypeValidatorTestLang.tokens
@@ -1,13 +1,13 @@
 '!'=40
 '!='=22
 '!=='=24
-'#'=68
+'#'=69
 '%'=39
 '%='=20
 '&&'=15
-'&'=90
-'('=62
-')'=63
+'&'=91
+'('=63
+')'=64
 '*'=36
 '**'=37
 '*='=18
@@ -24,8 +24,8 @@
 '..<'=29
 '/'=38
 '/='=19
-':'=74
-'::'=93
+':'=75
+'::'=94
 ';'=52
 '<'=27
 '<>'=32
@@ -35,52 +35,53 @@
 '=>'=31
 '>'=26
 '>='=25
-'?'=89
-'?.'=94
+'?'=90
+'?.'=95
 '?:'=33
-'['=69
-']'=70
-'abstract'=91
-'as'=67
-'case'=76
-'catch'=88
+'['=70
+']'=71
+'abstract'=92
+'as'=68
+'case'=77
+'catch'=89
 'class'=53
 'classWithSuperTypes'=59
-'constructor'=61
-'def'=65
-'default'=75
-'do'=79
-'else'=72
+'classWithWrongInferredInterface'=61
+'constructor'=62
+'def'=66
+'default'=76
+'do'=80
+'else'=73
 'extends'=45
 'extension'=48
 'false'=50
-'finally'=86
-'for'=77
-'if'=71
+'finally'=87
+'for'=78
+'if'=72
 'implements'=56
 'import'=47
-'instanceof'=66
+'instanceof'=67
 'interface'=58
-'new'=80
-'null'=81
+'new'=81
+'null'=82
 'package'=51
-'private'=92
-'return'=84
+'private'=93
+'return'=85
 'static'=46
 'super'=49
 'superTypes'=60
-'switch'=73
-'synchronized'=87
-'throw'=83
-'throws'=64
-'true'=97
-'try'=85
-'typeof'=82
+'switch'=74
+'synchronized'=88
+'throw'=84
+'throws'=65
+'true'=98
+'try'=86
+'typeof'=83
 'val'=44
-'var'=96
-'while'=78
+'var'=97
+'while'=79
 '{'=54
-'|'=95
+'|'=96
 '||'=14
 '}'=55
 RULE_ANY_OTHER=12
@@ -177,3 +178,4 @@ T__94=94
 T__95=95
 T__96=96
 T__97=97
+T__98=98