[Haxe] Support dropped for 'c'.code (#73)

Author: SlavaRa

PostfixCodeCompletion.Tests/PostfixCodeCompletion.Tests.csproj

@@ -50,7 +50,7 @@
   <ItemGroup>
     <Reference Include="NSubstitute, Version=2.0.3.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.2.0.3\lib\net40\NSubstitute.dll</HintPath>
-	  <Private>True</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
@@ -87,7 +87,6 @@
     <EmbeddedResource Include="Test Snippets\as3\postfixgenerators\var.fds" />
     <EmbeddedResource Include="Test Snippets\as3\postfixgenerators\while.fds" />
     <EmbeddedResource Include="Test Snippets\as3\postfixgenerators\trace.fds" />
-    <EmbeddedResource Include="Test Snippets\haxe\postfixgenerators\code.fds" />
     <EmbeddedResource Include="Test Snippets\haxe\postfixgenerators\dowhile.fds" />
     <EmbeddedResource Include="Test Snippets\haxe\postfixgenerators\else.fds" />
     <EmbeddedResource Include="Test Snippets\haxe\postfixgenerators\for.fds" />
@@ -179,7 +178,7 @@
     <ProjectReference Include="..\..\..\..\PluginCore\PluginCore.csproj">
       <Project>{61885F70-B4DC-4B44-852D-5D6D03F2A734}</Project>
       <Name>PluginCore</Name>
-	  <Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Tests\External\Plugins\ASCompletion.Tests\ASCompletion.Tests.csproj">
       <Project>{ABC71D26-295C-4C6C-B6DE-320AD49EEF79}</Project>
@@ -188,7 +187,7 @@
     <ProjectReference Include="..\..\ASCompletion\ASCompletion.csproj">
       <Project>{4EBF2653-9654-4E40-880E-0046B3D6210E}</Project>
       <Name>ASCompletion</Name>
-	  <Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\PostfixCodeCompletion\PostfixCodeCompletion.csproj">
       <Project>{e511b03b-81fd-4c39-b587-211f2a1603a1}</Project>

PostfixCodeCompletion.Tests/Test Snippets/haxe/postfixgenerators/code.fds

@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using ASCompletion;
 using ASCompletion.Completion;
 using ASCompletion.Context;
 using ASCompletion.Model;
@@ -110,32 +108,11 @@ internal static IEnumerable<ICompletionListItem> GetCompletionItems(Dictionary<s
         {
             var result = new List<ICompletionListItem>();
             if (templates.Count == 0) return result;
-            var sci = PluginBase.MainForm.CurrentDocument.SciControl;
-            Bitmap itemIcon = null;
-            var haxeStringCode = false;
-            var isHaxe = sci.ConfigurationLanguage.ToLower() == "haxe";
-            if (isHaxe)
-            {
-                var target = GetCompletionTarget(expr);
-                if (target?.Type == ASContext.Context.Features.stringKey)
-                {
-                    var pos = ASGenerator.GetStartOfStatement(sci, sci.CurrentPos, expr);
-                    haxeStringCode = sci.CharAt(pos) == '"' && sci.CharAt(pos + 1) != '\\' && sci.CharAt(pos + 2) == '"';
-                    if (haxeStringCode) itemIcon = (Bitmap) ASContext.Panel.GetIcon(PluginUI.ICON_PROPERTY);
-                }
-            }
             foreach (var pathToTemplate in templates)
             {
                 var fileName = Path.GetFileNameWithoutExtension(pathToTemplate.Key);
-                if (isHaxe && fileName == "code" && !haxeStringCode) continue;
                 var template = TemplateUtils.ProcessTemplate(pattern, pathToTemplate.Value, expr);
-                var item = new PostfixCompletionItem(fileName, template, expr) {Pattern = pattern};
-                if (isHaxe && fileName == "code" && itemIcon != null)
-                {
-                    item.Icon = itemIcon;
-                    itemIcon = null;
-                }
-                result.Add(item);
+                result.Add(new PostfixCompletionItem(fileName, template, expr) {Pattern = pattern});
             }
             return result;
         }
@@ -200,30 +177,30 @@ internal static bool IsHash(MemberModel target)
                     var type = target.Type;
                     return type == ASContext.Context.Features.objectKey || type == "Dictionary";
                 case "haxe":
-                    Func<MemberModel, bool> isIterator = member =>
-                    {
-                        var cleanType = Reflector.ASGenerator.CleanType(member.Type);
-                        return cleanType == "Iterator" || cleanType == "Iterable";
-                    };
-                    if (isIterator(target)) return true;
-                    if (target is ClassModel)
+                    if (IsIterator(target)) return true;
+                    if (target is ClassModel classModel)
                     {
-                        var classModel = target as ClassModel;
                         while (classModel != null && !classModel.IsVoid())
                         {
-                            if (classModel.Members.Items.Any(isIterator)) return true;
+                            if (classModel.Members.Items.Any(IsIterator)) return true;
                             classModel.ResolveExtends();
                             classModel = classModel.Extends;
                         }
                     }
                     return false;
+
+                    bool IsIterator(MemberModel member)
+                    {
+                        var cleanType = Reflector.ASGenerator.CleanType(member.Type);
+                        return cleanType == "Iterator" || cleanType == "Iterable";
+                    }
                 default: return false;
             }
         }
 
         internal static bool IsNumber(MemberModel target)
         {
-            var type = target is ClassModel ? ((ClassModel)target).QualifiedName : target.Type;
+            var type = target is ClassModel model ? model.QualifiedName : target.Type;
             if (type == ASContext.Context.Features.numberKey) return true;
             var language = PluginBase.MainForm.CurrentDocument.SciControl.ConfigurationLanguage.ToLower();
             var features = Settings.LanguageFeatures.First(it => it.Language == language);
@@ -248,8 +225,8 @@ public PostfixCompletionItem(string label, string template, ASResult expr)
         string pattern;
         public virtual string Pattern
         {
-            get { return pattern ?? TemplateUtils.PatternMember; }
-            set { pattern = value; }
+            get => pattern ?? TemplateUtils.PatternMember;
+            set => pattern = value;
         }
 
         public string Value
@@ -264,8 +241,8 @@ public string Value
         Bitmap icon;
         public Bitmap Icon
         {
-            get { return icon ?? (icon = (Bitmap)PluginBase.MainForm.FindImage("341")); }
-            set { icon = value; }
+            get => icon ?? (icon = (Bitmap)PluginBase.MainForm.FindImage("341"));
+            set => icon = value;
         }
 
         string description;

PostfixCodeCompletion/Helpers/ScintillaControlHelper.cs

@@ -39,8 +39,7 @@ Available templates for **AS3**:
 * `.trace` - surrounds expression with `trace(expr);`
 
 Available templates for **Haxe**:
-* `.code` – for `String` adds `code` to completion list
-* `.if` – checks boolean expression to be true  `if (expr)`
+* `.if` – checks boolean expression to be true `if (expr)`
 * `.else` – checks boolean expression to be false  `if (!expr)`
 * `.null` – checks nullable expression to be null `if (expr == null)`
 * `.notnull` – checks expression to be non-null `if (expr != null)`