[CodeGenerator] Fixed 'class Foo extends NewClass<generator>'. fixes fdorg#2891 (fdorg#2892)

Author: SlavaRa

External/Plugins/ASCompletion/Completion/ASGenerator.cs

@@ -657,7 +657,14 @@ protected virtual bool CanShowGenerateClass(ScintillaControl sci, int position,
             // for example: public var foo : Foo<generator>
             return expr.Context.Separator == ":"
                    // for example, good: new Type()<generator>, bad: new Type().value<generator>
-                   || (expr.Context.WordBefore == "new" && !expr.Context.Value.Contains("~."));
+                   || (expr.Context.WordBefore == "new" && !expr.Context.Value.Contains("~."))
+                   // for example: class Foo extends Bar<generator>
+                   || (expr.Context.WordBefore == "extends"
+                       && ASContext.Context.CurrentClass.Flags is var flags 
+                       && flags.HasFlag(FlagType.Class)
+                       // for example: interface Foo extends Bar<generator>
+                       && !flags.HasFlag(FlagType.Interface)
+                       && ASContext.Context.CodeComplete.PositionIsBeforeBody(sci, position, found.InClass));
         }
 
         /// <summary>
@@ -672,8 +679,8 @@ protected virtual bool CanShowGenerateInterface(ScintillaControl sci, int positi
         {
             return contextToken != null
                    && ASComplete.IsTextStyle(sci.BaseStyleAt(position - 1))
-                   // fox example: implements IFoo<generator>
-                   && ((expr.Context.WordBefore == "implements" && ASContext.Context.CodeComplete.PositionIsBeforeBody(sci, position, found.InClass))
+                   // for example: implements IFoo<generator>
+                   && (expr.Context.WordBefore == "implements" && ASContext.Context.CodeComplete.PositionIsBeforeBody(sci, position, found.InClass)
                        // for example: public var foo : Fo|o
                        || (expr.Context.Separator == ":"));
         }

Tests/External/Plugins/HaxeContext.Tests/Generators/CodeGeneratorTests.cs

@@ -3415,8 +3415,6 @@ public string GenerateFunctionWithDefaultModifierDeclaration(string fileName, Ge
             return result;
         }
 
-
-
         static IEnumerable<TestCaseData> CanGenerateEnumTestCases
         {
             get
@@ -3436,9 +3434,20 @@ static IEnumerable<TestCaseData> CanGenerateEnumTestCases
             }
         }
 
+        static IEnumerable<TestCaseData> CanGenerateClassTestCases_issue2891
+        {
+            get
+            {
+                yield return new TestCaseData("CanGenerateClass_issue2891_1", GeneratorJobType.Class)
+                    .Returns(true)
+                    .SetName("Can Generate Class. Issue 2891. Case 1");
+            }
+        }
+
         [
             Test,
             TestCaseSource(nameof(CanGenerateEnumTestCases)),
+            TestCaseSource(nameof(CanGenerateClassTestCases_issue2891)),
         ]
         public bool HasGenerator(string fileName, GeneratorJobType job)
         {

Tests/External/Plugins/HaxeContext.Tests/HaxeContext.Tests.csproj

@@ -1785,6 +1785,7 @@
     <EmbeddedResource Include="Test Files\generators\code\CanGenerateEnum_2.hx" />
     <EmbeddedResource Include="Test Files\generators\code\CanGenerateEnum_3.hx" />
     <EmbeddedResource Include="Test Files\generators\code\CanGenerateEnum_4.hx" />
+    <EmbeddedResource Include="Test Files\generators\code\CanGenerateClass_issue2891_1.hx" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Tests/External/Plugins/HaxeContext.Tests/Test Files/generators/code/CanGenerateClass_issue2891_1.hx

@@ -0,0 +1,3 @@
+package;
+public class Issue2891_1 extends VCla$(EntryPoint)ss {
+}