Closes #30

Author: slavara

PostfixCodeCompletion/Helpers/TemplateUtils.cs

@@ -28,6 +28,7 @@ static class TemplateUtils
         internal const string PATTERN_BOOL = "Boolean";
         internal const string PATTERN_NUMBER = "Number";
         internal const string PATTERN_STRING = "String";
+        internal const string PATTERN_TYPE = "PCCType";
         public static Settings Settings { get; set; }
 
         static readonly List<string> Templates = new List<string>
@@ -38,7 +39,8 @@ static class TemplateUtils
             PATTERN_HASH,
             PATTERN_BOOL,
             PATTERN_NUMBER,
-            PATTERN_STRING
+            PATTERN_STRING,
+            PATTERN_TYPE
         };
 
         internal static bool GetHasTemplates()
@@ -82,7 +84,7 @@ internal static Dictionary<string, string> GetTemplates(string type)
                 foreach (var file in Directory.GetFiles(path, "*.fds"))
                 {
                     var content = GetFileContent(file);
-                    var marker = "#pcc:" + type;
+                    var marker = $"#pcc:{type}";
                     var startIndex = content.IndexOf(marker, StringComparison.Ordinal);
                     if (startIndex != -1)
                     {

PostfixCodeCompletion/PluginMain.cs

@@ -180,7 +180,7 @@ static void UpdateCompletionList(MemberModel target, ASResult expr)
             if (allItems != null)
             {
                 var labels = new HashSet<string>();
-                foreach (var item in allItems)
+                foreach (var item in allItems.OfType<PostfixCompletionItem>())
                 {
                     labels.Add(item.Label);
                 }
@@ -193,6 +193,14 @@ static void UpdateCompletionList(MemberModel target, ASResult expr)
             }
             var sci = PluginBase.MainForm.CurrentDocument.SciControl;
             var word = sci.GetWordLeft(sci.CurrentPos - 1, false);
+            if (!string.IsNullOrEmpty(word))
+            {
+                items = items.FindAll(it =>
+                {
+                    var score = CompletionList.SmartMatch(it.Label, word, word.Length);
+                    return score > 0 && score < 6;
+                });
+            }
             CompletionList.Show(items, false, word);
             var list = Reflector.CompletionList.completionList;
             completionListItemCount = list.Items.Count;
@@ -267,6 +275,7 @@ static List<ICompletionListItem> GetPostfixCompletionItems(MemberModel target, A
             if (IsBoolean(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_BOOL, expr));
             if (IsNumber(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_NUMBER, expr));
             if (IsString(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_STRING, expr));
+            if (IsType(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_TYPE, expr));
             return result.Distinct().ToList();
         }
 
@@ -342,6 +351,8 @@ static bool IsNumber(MemberModel target)
 
         static bool IsString(MemberModel target) => target.Type == ASContext.Context.Features.stringKey;
 
+        static bool IsType(MemberModel target) => target.Flags == FlagType.Class;
+
         static IEnumerable<ICompletionListItem> GetCompletionItems(string pattern, MemberModel target, ASResult expr)
         {
             var type = ASContext.Context.ResolveType(target.Type, ASContext.Context.CurrentModel);

Snippets/as3/postfixgenerators/new.fds

@@ -0,0 +1 @@
+new $(PCCType)($(EntryPoint))

Snippets/haxe/postfixgenerators/new.fds

@@ -0,0 +1 @@
+new $(PCCType)($(EntryPoint))