Merge pull request #46 from SlavaRa/develop

SlavaRa · SlavaRa · commit d4bb1c2d7f8c · 2016-04-19T01:15:55.000+03:00
Cleanup...
diff --git a/PostfixCodeCompletion/Helpers/TemplateUtils.cs b/PostfixCodeCompletion/Helpers/TemplateUtils.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -13,41 +12,40 @@
 
 namespace PostfixCodeCompletion.Helpers
 {
-    static class TemplateUtils
+    internal static class TemplateUtils
     {
-        public const string PATTERN_BLOCK = @"\$\([^\)]*{0}.*?\)";
-        public const string PATTERN_T_BLOCK = @"[^\$]*?\$\({0}\)";
-        internal const string POSTFIX_GENERATORS = "PostfixGenerators";
-        internal const string PATTERN_MEMBER = "PCCMember";
-        internal const string PATTERN_NULLABLE = "PCCNullable";
-        internal const string PATTERN_COLLECTION = "PCCCollection";
-        internal const string PATTERN_COLLECTION_KEY_TYPE = "$(CollectionKeyType)";
-        internal const string PATTERN_COLLECTION_ITEM_TYPE = "$(CollectionItemType)";
-        internal const string PATTERN_HASH = "PCCHash";
-        internal const string PATTERN_BOOL = "PCCBoolean";
-        internal const string PATTERN_NUMBER = "PCCNumber";
-        internal const string PATTERN_STRING = "PCCString";
-        internal const string PATTERN_TYPE = "PCCType";
+        public const string PatternBlock = @"\$\([^\)]*{0}.*?\)";
+        public const string PatternTBlock = @"[^\$]*?\$\({0}\)";
+        internal const string PostfixGenerators = "PostfixGenerators";
+        internal const string PatternMember = "PCCMember";
+        internal const string PatternNullable = "PCCNullable";
+        internal const string PatternCollection = "PCCCollection";
+        internal const string PatternCollectionKeyType = "$(CollectionKeyType)";
+        internal const string PatternCollectionItemType = "$(CollectionItemType)";
+        internal const string PatternHash = "PCCHash";
+        internal const string PatternBool = "PCCBoolean";
+        internal const string PatternNumber = "PCCNumber";
+        internal const string PatternString = "PCCString";
+        internal const string PatternType = "PCCType";
         public static Settings Settings { get; set; }
 
         static readonly List<string> Templates = new List<string>
         {
-            PATTERN_MEMBER,
-            PATTERN_NULLABLE,
-            PATTERN_COLLECTION,
-            PATTERN_HASH,
-            PATTERN_BOOL,
-            PATTERN_NUMBER,
-            PATTERN_STRING,
-            PATTERN_TYPE
+            PatternMember,
+            PatternNullable,
+            PatternCollection,
+            PatternHash,
+            PatternBool,
+            PatternNumber,
+            PatternString,
+            PatternType
         };
         
         internal static bool GetHasTemplates() => GetHasTemplates(PluginBase.MainForm.CurrentDocument.SciControl.ConfigurationLanguage.ToLower());
 
         internal static bool GetHasTemplates(string language)
         {
-            return GetHasTemplates(PathHelper.SnippetDir, language)
-                || Settings.CustomSnippetDirectories.Any(it => GetHasTemplates(it.Path, language));
+            return GetHasTemplates(PathHelper.SnippetDir, language) || Settings.CustomSnippetDirectories.Any(it => GetHasTemplates(it.Path, language));
         }
 
         static bool GetHasTemplates(string snippetPath, string language)
@@ -58,11 +56,11 @@ static bool GetHasTemplates(string snippetPath, string language)
 
         static string GetTemplatesDir(string snippetPath) => GetTemplatesDir(snippetPath, PluginBase.MainForm.CurrentDocument.SciControl.ConfigurationLanguage.ToLower());
 
-        static string GetTemplatesDir(string snippetPath, string language) => Path.Combine(Path.Combine(snippetPath, language), POSTFIX_GENERATORS);
+        static string GetTemplatesDir(string snippetPath, string language) => Path.Combine(Path.Combine(snippetPath, language), PostfixGenerators);
 
         internal static Dictionary<string, string> GetTemplates(string type)
         {
-            var pattern = Templates.Contains(type) ? string.Format(PATTERN_BLOCK, type) : string.Format(PATTERN_T_BLOCK, type);
+            var pattern = Templates.Contains(type) ? string.Format(PatternBlock, type) : string.Format(PatternTBlock, type);
             var result = new Dictionary<string, string>();
             var paths = Settings.CustomSnippetDirectories.Select(it => GetTemplatesDir(it.Path)).ToList();
             paths.Add(GetTemplatesDir(PathHelper.SnippetDir));
@@ -73,13 +71,13 @@ internal static Dictionary<string, string> GetTemplates(string type)
                 {
                     var content = GetFileContent(file);
                     var marker = $"#pcc:{type}";
-                    var startIndex = content.IndexOf(marker, StringComparison.Ordinal);
+                    var startIndex = content.IndexOfOrdinal(marker);
                     if (startIndex != -1)
                     {
                         startIndex += marker.Length;
                         content = content.Remove(0, startIndex);
                     }
-                    startIndex = content.IndexOf("#pcc:", StringComparison.Ordinal);
+                    startIndex = content.IndexOfOrdinal("#pcc:");
                     if (startIndex != -1) content = content.Remove(startIndex);
                     if (!Regex.IsMatch(content, pattern, RegexOptions.IgnoreCase | RegexOptions.Multiline)) continue;
                     result.Add(file, content.Replace("\r\n", "\n"));
@@ -125,7 +123,7 @@ internal static KeyValuePair<string, string> GetVarNameToQualifiedName(ASResult
         internal static string ProcessMemberTemplate(string template, ASResult expr)
         {
             var varNameToQualifiedName = GetVarNameToQualifiedName(expr);
-            var name = varNameToQualifiedName.Key.ToLower();
+            var name = varNameToQualifiedName.Key;
             var type = varNameToQualifiedName.Value;
             template = ASCompletion.Completion.TemplateUtils.ReplaceTemplateVariable(template, "Name", name);
             if (ASContext.Context is Context && Settings != null && Settings.DisableTypeDeclaration) type = null;
@@ -145,10 +143,10 @@ internal static string ProcessCollectionTemplate(string template, ASResult expr)
                 case "as2":
                 case "as3":
                     if (string.IsNullOrEmpty(type)) type = ASContext.Context.Features.dynamicKey;
-                    template = template.Replace(PATTERN_COLLECTION_KEY_TYPE, "int");
+                    template = template.Replace(PatternCollectionKeyType, "int");
                     break;
             }
-            return template.Replace(PATTERN_COLLECTION_ITEM_TYPE, type);
+            return template.Replace(PatternCollectionItemType, type);
         }
 
         internal static string ProcessHashTemplate(string template, ASResult expr)
@@ -163,8 +161,8 @@ internal static string ProcessHashTemplate(string template, ASResult expr)
                     var objectKey = features.objectKey;
                     if (type == objectKey || type == "Dictionary")
                     {
-                        template = template.Replace(PATTERN_COLLECTION_KEY_TYPE, type == objectKey ? features.stringKey : objectKey);
-                        template = template.Replace(PATTERN_COLLECTION_ITEM_TYPE, features.dynamicKey);
+                        template = template.Replace(PatternCollectionKeyType, type == objectKey ? features.stringKey : objectKey);
+                        template = template.Replace(PatternCollectionItemType, features.dynamicKey);
                     }
                     break;
             }
@@ -180,7 +178,7 @@ internal static string GetDescription(ASResult expr, string template, string pcc
             var line = sci.GetLine(lineNum);
             var snippet = line.Substring(exprStartPosition - sci.PositionFromLine(lineNum), position - exprStartPosition);
             var result = template.Replace(SnippetHelper.BOUNDARY, string.Empty);
-            result = Regex.Replace(result, string.Format(PATTERN_BLOCK, pccpattern), snippet, RegexOptions.IgnoreCase | RegexOptions.Multiline);
+            result = Regex.Replace(result, string.Format(PatternBlock, pccpattern), snippet, RegexOptions.IgnoreCase | RegexOptions.Multiline);
             result = ProcessMemberTemplate(result, expr);
             result = ArgsProcessor.ProcessCodeStyleLineBreaks(result);
             result = result.Replace(SnippetHelper.ENTRYPOINT, "|");
@@ -196,7 +194,7 @@ internal static void InsertSnippetText(ASResult expr, string template, string pc
             sci.ReplaceSel(string.Empty);
             position = ScintillaControlHelper.GetExpressionStartPosition(sci, sci.CurrentPos, expr);
             sci.SetSel(position, sci.CurrentPos);
-            var snippet = Regex.Replace(template, string.Format(PATTERN_BLOCK, pccpattern), sci.SelText, RegexOptions.IgnoreCase | RegexOptions.Multiline);
+            var snippet = Regex.Replace(template, string.Format(PatternBlock, pccpattern), sci.SelText, RegexOptions.IgnoreCase | RegexOptions.Multiline);
             snippet = ProcessMemberTemplate(snippet, expr);
             snippet = ArgsProcessor.ProcessCodeStyleLineBreaks(snippet);
             sci.ReplaceSel(string.Empty);
diff --git a/PostfixCodeCompletion/PluginMain.cs b/PostfixCodeCompletion/PluginMain.cs
@@ -32,17 +32,17 @@ public class PluginMain : IPlugin
 
         #region Required Properties
 
-        public int Api { get { return 1; }}
+        public int Api => 1;
 
-        public string Name { get { return "PostfixCodeCompletion"; }}
+        public string Name => "PostfixCodeCompletion";
 
-        public string Guid { get { return "21d9ab3e-93e4-4460-9298-c62f87eed7ba"; }}
+        public string Guid => "21d9ab3e-93e4-4460-9298-c62f87eed7ba";
 
-        public string Help { get { return ""; }}
+        public string Help => string.Empty;
 
-        public string Author { get { return "SlavaRa"; }}
+        public string Author => "SlavaRa";
 
-        public string Description { get { return "Postfix code completion helps reduce backward caret jumps as you write code"; }}
+        public string Description => "Postfix code completion helps reduce backward caret jumps as you write code";
 
         public object Settings { get; private set; }
 
@@ -149,13 +149,13 @@ void AddEventHandlers()
         /// </summary>
         void SaveSettings() => ObjectSerializer.Serialize(settingFilename, Settings);
 
-        static void UpdateCompletionList()
+        void UpdateCompletionList()
         {
             var expr = GetPostfixCompletionExpr();
             UpdateCompletionList(expr);
         }
 
-        static void UpdateCompletionList(ASResult expr)
+        void UpdateCompletionList(ASResult expr)
         {
             if (expr == null || expr.IsNull()) return;
             var target = GetPostfixCompletionTarget(expr);
@@ -171,7 +171,7 @@ static void UpdateCompletionList(ASResult expr)
             hc.GetPositionType(OnFunctionTypeResult);
         }
 
-        static void UpdateCompletionList(MemberModel target, ASResult expr)
+        void UpdateCompletionList(MemberModel target, ASResult expr)
         {
             if (target == null || !TemplateUtils.GetHasTemplates()) return;
             var items = GetPostfixCompletionItems(target, expr);
@@ -248,32 +248,32 @@ static MemberModel GetPostfixCompletionTarget(ASResult expr)
             return null;
         }
 
-        static List<ICompletionListItem> GetPostfixCompletionItems(MemberModel target, ASResult expr)
+        List<ICompletionListItem> GetPostfixCompletionItems(MemberModel target, ASResult expr)
         {
             var result = new List<ICompletionListItem>();
             if (expr.Member != null) result.AddRange(GetCompletionItems(expr.Member.Type, target, expr));
             else if (expr.Type != null) result.AddRange(GetCompletionItems(expr.Type.Type, target, expr));
-            result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_MEMBER, expr));
-            if (IsNullable(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_NULLABLE, expr));
-            if (IsCollection(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_COLLECTION, expr));
-            if (IsHash(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_HASH, expr));
+            result.AddRange(GetCompletionItems(TemplateUtils.PatternMember, expr));
+            if (IsNullable(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternNullable, expr));
+            if (IsCollection(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternCollection, expr));
+            if (IsHash(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternHash, expr));
             if (PluginBase.MainForm.CurrentDocument.SciControl.ConfigurationLanguage.ToLower() == "haxe")
             {
                 var type = !string.IsNullOrEmpty(expr.Type?.Type) && expr.Type.Type != ASContext.Context.Features.voidKey ? expr.Type : null;
                 if (type != null)
                 {
-                    if (IsCollection(type)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_COLLECTION, expr));
-                    if (IsHash(type)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_HASH, expr));
+                    if (IsCollection(type)) result.AddRange(GetCompletionItems(TemplateUtils.PatternCollection, expr));
+                    if (IsHash(type)) result.AddRange(GetCompletionItems(TemplateUtils.PatternHash, expr));
                 }
             }
-            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));
+            if (IsBoolean(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternBool, expr));
+            if (IsNumber(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternNumber, expr));
+            if (IsString(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternString, expr));
+            if (IsType(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternType, expr));
             return result.Distinct().ToList();
         }
 
-        static bool IsNullable(MemberModel target) => !IsNumber(target) && target.Type != ASContext.Context.Features.booleanKey;
+        bool IsNullable(MemberModel target) => !IsNumber(target) && target.Type != ASContext.Context.Features.booleanKey;
 
         static bool IsCollection(MemberModel target)
         {
@@ -326,20 +326,13 @@ static bool IsHash(MemberModel target)
 
         static bool IsBoolean(MemberModel target) => target.Type == ASContext.Context.Features.booleanKey;
 
-        static bool IsNumber(MemberModel target)
+        bool IsNumber(MemberModel target)
         {
             var type = target is ClassModel ? ((ClassModel)target).QualifiedName : target.Type;
             if (type == ASContext.Context.Features.numberKey) return true;
-            switch (PluginBase.MainForm.CurrentDocument.SciControl.ConfigurationLanguage)
-            {
-                case "as2":
-                case "as3":
-                    return type == "int" || type == "uint";
-                case "haxe":
-                    return type == "Int" || type == "UInt";
-                default:
-                    return false;
-            }
+            var language = PluginBase.MainForm.CurrentDocument.SciControl.ConfigurationLanguage.ToLower();
+            var features = ((Settings)Settings).LanguageFeatures.First(it => it.Language == language);
+            return features != null && features.Numeric.Contains(type);
         }
 
         static bool IsString(MemberModel target) => target.Type == ASContext.Context.Features.stringKey;
@@ -383,10 +376,10 @@ static IEnumerable<ICompletionListItem> GetCompletionItems(Dictionary<string, st
                 var template = pathToTemplate.Value;
                 switch (pattern)
                 {
-                    case TemplateUtils.PATTERN_COLLECTION:
+                    case TemplateUtils.PatternCollection:
                         template = TemplateUtils.ProcessCollectionTemplate(template, expr);
                         break;
-                    case TemplateUtils.PATTERN_HASH:
+                    case TemplateUtils.PatternHash:
                         template = TemplateUtils.ProcessHashTemplate(template, expr);
                         break;
                 }
@@ -426,7 +419,7 @@ static Process CreateHaxeProcess(string args)
 
         #region Event Handlers
 
-        static void OnCharAdded(ScintillaControl sender, int value)
+        void OnCharAdded(ScintillaControl sender, int value)
         {
             try
             {
@@ -451,14 +444,14 @@ static void OnCharAdded(ScintillaControl sender, int value)
             }
         }
 
-        static void OnCompletionListVisibleChanged(object o, EventArgs args)
+        void OnCompletionListVisibleChanged(object o, EventArgs args)
         {
             var list = Reflector.CompletionList.CompletionList;
             if (list.Visible) UpdateCompletionList();
             else list.SelectedValueChanged -= OnCompletionListSelectedValueChanged;
         }
 
-        static void OnCompletionListSelectedValueChanged(object sender, EventArgs args)
+        void OnCompletionListSelectedValueChanged(object sender, EventArgs args)
         {
             var list = Reflector.CompletionList.CompletionList;
             list.SelectedValueChanged -= OnCompletionListSelectedValueChanged;
@@ -517,7 +510,7 @@ static void OnHaxeContextFallbackNeeded(bool notSupported)
             completionModeHandler = new CompilerCompletionHandler(CreateHaxeProcess(string.Empty));
         }
 
-        static void OnFunctionTypeResult(HaxeComplete hc, HaxeCompleteResult result, HaxeCompleteStatus status)
+        void OnFunctionTypeResult(HaxeComplete hc, HaxeCompleteResult result, HaxeCompleteStatus status)
         {
             switch (status)
             {
@@ -549,7 +542,7 @@ static void OnFunctionTypeResult(HaxeComplete hc, HaxeCompleteResult result, Hax
         #endregion
     }
 
-    class PostfixCompletionItem : ICompletionListItem
+    internal class PostfixCompletionItem : ICompletionListItem
     {
         readonly string template;
         readonly ASResult expr;
@@ -561,12 +554,12 @@ public PostfixCompletionItem(string label, string template, ASResult expr)
             this.expr = expr;
         }
 
-        public string Label { get; set; }
+        public string Label { get; }
 
         string pattern;
         public virtual string Pattern
         {
-            get { return pattern ?? TemplateUtils.PATTERN_MEMBER; }
+            get { return pattern ?? TemplateUtils.PatternMember; }
             set { pattern = value; }
         }
 
@@ -587,15 +580,9 @@ public Bitmap Icon
         }
 
         string description;
-        public string Description
-        {
-            get
-            {
-                return description ?? (description = TemplateUtils.GetDescription(expr, template, Pattern));
-            }
-        }
+        public string Description => description ?? (description = TemplateUtils.GetDescription(expr, template, Pattern));
 
-        public new string ToString() { return Description; }
+        public new string ToString() => Description;
 
         /// <summary>
         /// Determines whether the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>.
@@ -618,9 +605,6 @@ public override bool Equals(object obj)
         /// A hash code for the current <see cref="T:System.Object"/>.
         /// </returns>
         /// <filterpriority>2</filterpriority>
-        public override int GetHashCode()
-        {
-            return Label.GetHashCode() ^ expr.GetHashCode();
-        }
+        public override int GetHashCode() => Label.GetHashCode() ^ expr.GetHashCode();
     }
 }
diff --git a/PostfixCodeCompletion/Settings.cs b/PostfixCodeCompletion/Settings.cs

Original file line number	Diff line number	Diff line change
`@@ -32,17 +32,17 @@ public class PluginMain : IPlugin`
`32`	`32`
`33`	`33`	`#region Required Properties`
`34`	`34`
`35`		`- public int Api { get { return 1; }}`
	`35`	`+ public int Api => 1;`
`36`	`36`
`37`		`- public string Name { get { return "PostfixCodeCompletion"; }}`
	`37`	`+ public string Name => "PostfixCodeCompletion";`
`38`	`38`
`39`		`- public string Guid { get { return "21d9ab3e-93e4-4460-9298-c62f87eed7ba"; }}`
	`39`	`+ public string Guid => "21d9ab3e-93e4-4460-9298-c62f87eed7ba";`
`40`	`40`
`41`		`- public string Help { get { return ""; }}`
	`41`	`+ public string Help => string.Empty;`
`42`	`42`
`43`		`- public string Author { get { return "SlavaRa"; }}`
	`43`	`+ public string Author => "SlavaRa";`
`44`	`44`
`45`		`- public string Description { get { return "Postfix code completion helps reduce backward caret jumps as you write code"; }}`
	`45`	`+ public string Description => "Postfix code completion helps reduce backward caret jumps as you write code";`
`46`	`46`
`47`	`47`	`public object Settings { get; private set; }`
`48`	`48`
`@@ -149,13 +149,13 @@ void AddEventHandlers()`
`149`	`149`	`/// </summary>`
`150`	`150`	`void SaveSettings() => ObjectSerializer.Serialize(settingFilename, Settings);`
`151`	`151`
`152`		`- static void UpdateCompletionList()`
	`152`	`+ void UpdateCompletionList()`
`153`	`153`	`{`
`154`	`154`	`var expr = GetPostfixCompletionExpr();`
`155`	`155`	`UpdateCompletionList(expr);`
`156`	`156`	`}`
`157`	`157`
`158`		`- static void UpdateCompletionList(ASResult expr)`
	`158`	`+ void UpdateCompletionList(ASResult expr)`
`159`	`159`	`{`
`160`	`160`	`if (expr == null \|\| expr.IsNull()) return;`
`161`	`161`	`var target = GetPostfixCompletionTarget(expr);`
`@@ -171,7 +171,7 @@ static void UpdateCompletionList(ASResult expr)`
`171`	`171`	`hc.GetPositionType(OnFunctionTypeResult);`
`172`	`172`	`}`
`173`	`173`
`174`		`- static void UpdateCompletionList(MemberModel target, ASResult expr)`
	`174`	`+ void UpdateCompletionList(MemberModel target, ASResult expr)`
`175`	`175`	`{`
`176`	`176`	`if (target == null \|\| !TemplateUtils.GetHasTemplates()) return;`
`177`	`177`	`var items = GetPostfixCompletionItems(target, expr);`
`@@ -248,32 +248,32 @@ static MemberModel GetPostfixCompletionTarget(ASResult expr)`
`248`	`248`	`return null;`
`249`	`249`	`}`
`250`	`250`
`251`		`- static List<ICompletionListItem> GetPostfixCompletionItems(MemberModel target, ASResult expr)`
	`251`	`+ List<ICompletionListItem> GetPostfixCompletionItems(MemberModel target, ASResult expr)`
`252`	`252`	`{`
`253`	`253`	`var result = new List<ICompletionListItem>();`
`254`	`254`	`if (expr.Member != null) result.AddRange(GetCompletionItems(expr.Member.Type, target, expr));`
`255`	`255`	`else if (expr.Type != null) result.AddRange(GetCompletionItems(expr.Type.Type, target, expr));`
`256`		`- result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_MEMBER, expr));`
`257`		`- if (IsNullable(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_NULLABLE, expr));`
`258`		`- if (IsCollection(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_COLLECTION, expr));`
`259`		`- if (IsHash(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_HASH, expr));`
	`256`	`+ result.AddRange(GetCompletionItems(TemplateUtils.PatternMember, expr));`
	`257`	`+ if (IsNullable(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternNullable, expr));`
	`258`	`+ if (IsCollection(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternCollection, expr));`
	`259`	`+ if (IsHash(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternHash, expr));`
`260`	`260`	`if (PluginBase.MainForm.CurrentDocument.SciControl.ConfigurationLanguage.ToLower() == "haxe")`
`261`	`261`	`{`
`262`	`262`	`var type = !string.IsNullOrEmpty(expr.Type?.Type) && expr.Type.Type != ASContext.Context.Features.voidKey ? expr.Type : null;`
`263`	`263`	`if (type != null)`
`264`	`264`	`{`
`265`		`- if (IsCollection(type)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_COLLECTION, expr));`
`266`		`- if (IsHash(type)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_HASH, expr));`
	`265`	`+ if (IsCollection(type)) result.AddRange(GetCompletionItems(TemplateUtils.PatternCollection, expr));`
	`266`	`+ if (IsHash(type)) result.AddRange(GetCompletionItems(TemplateUtils.PatternHash, expr));`
`267`	`267`	`}`
`268`	`268`	`}`
`269`		`- if (IsBoolean(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_BOOL, expr));`
`270`		`- if (IsNumber(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_NUMBER, expr));`
`271`		`- if (IsString(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_STRING, expr));`
`272`		`- if (IsType(target)) result.AddRange(GetCompletionItems(TemplateUtils.PATTERN_TYPE, expr));`
	`269`	`+ if (IsBoolean(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternBool, expr));`
	`270`	`+ if (IsNumber(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternNumber, expr));`
	`271`	`+ if (IsString(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternString, expr));`
	`272`	`+ if (IsType(target)) result.AddRange(GetCompletionItems(TemplateUtils.PatternType, expr));`
`273`	`273`	`return result.Distinct().ToList();`
`274`	`274`	`}`
`275`	`275`
`276`		`- static bool IsNullable(MemberModel target) => !IsNumber(target) && target.Type != ASContext.Context.Features.booleanKey;`
	`276`	`+ bool IsNullable(MemberModel target) => !IsNumber(target) && target.Type != ASContext.Context.Features.booleanKey;`
`277`	`277`
`278`	`278`	`static bool IsCollection(MemberModel target)`
`279`	`279`	`{`
`@@ -326,20 +326,13 @@ static bool IsHash(MemberModel target)`
`326`	`326`
`327`	`327`	`static bool IsBoolean(MemberModel target) => target.Type == ASContext.Context.Features.booleanKey;`
`328`	`328`
`329`		`- static bool IsNumber(MemberModel target)`
	`329`	`+ bool IsNumber(MemberModel target)`
`330`	`330`	`{`
`331`	`331`	`var type = target is ClassModel ? ((ClassModel)target).QualifiedName : target.Type;`
`332`	`332`	`if (type == ASContext.Context.Features.numberKey) return true;`
`333`		`- switch (PluginBase.MainForm.CurrentDocument.SciControl.ConfigurationLanguage)`
`334`		`- {`
`335`		`- case "as2":`
`336`		`- case "as3":`
`337`		`- return type == "int" \|\| type == "uint";`
`338`		`- case "haxe":`
`339`		`- return type == "Int" \|\| type == "UInt";`
`340`		`- default:`
`341`		`- return false;`
`342`		`- }`
	`333`	`+ var language = PluginBase.MainForm.CurrentDocument.SciControl.ConfigurationLanguage.ToLower();`
	`334`	`+ var features = ((Settings)Settings).LanguageFeatures.First(it => it.Language == language);`
	`335`	`+ return features != null && features.Numeric.Contains(type);`
`343`	`336`	`}`
`344`	`337`
`345`	`338`	`static bool IsString(MemberModel target) => target.Type == ASContext.Context.Features.stringKey;`
`@@ -383,10 +376,10 @@ static IEnumerable<ICompletionListItem> GetCompletionItems(Dictionary<string, st`
`383`	`376`	`var template = pathToTemplate.Value;`
`384`	`377`	`switch (pattern)`
`385`	`378`	`{`
`386`		`- case TemplateUtils.PATTERN_COLLECTION:`
	`379`	`+ case TemplateUtils.PatternCollection:`
`387`	`380`	`template = TemplateUtils.ProcessCollectionTemplate(template, expr);`
`388`	`381`	`break;`
`389`		`- case TemplateUtils.PATTERN_HASH:`
	`382`	`+ case TemplateUtils.PatternHash:`
`390`	`383`	`template = TemplateUtils.ProcessHashTemplate(template, expr);`
`391`	`384`	`break;`
`392`	`385`	`}`
`@@ -426,7 +419,7 @@ static Process CreateHaxeProcess(string args)`
`426`	`419`
`427`	`420`	`#region Event Handlers`
`428`	`421`
`429`		`- static void OnCharAdded(ScintillaControl sender, int value)`
	`422`	`+ void OnCharAdded(ScintillaControl sender, int value)`
`430`	`423`	`{`
`431`	`424`	`try`
`432`	`425`	`{`
`@@ -451,14 +444,14 @@ static void OnCharAdded(ScintillaControl sender, int value)`
`451`	`444`	`}`
`452`	`445`	`}`
`453`	`446`
`454`		`- static void OnCompletionListVisibleChanged(object o, EventArgs args)`
	`447`	`+ void OnCompletionListVisibleChanged(object o, EventArgs args)`
`455`	`448`	`{`
`456`	`449`	`var list = Reflector.CompletionList.CompletionList;`
`457`	`450`	`if (list.Visible) UpdateCompletionList();`
`458`	`451`	`else list.SelectedValueChanged -= OnCompletionListSelectedValueChanged;`
`459`	`452`	`}`
`460`	`453`
`461`		`- static void OnCompletionListSelectedValueChanged(object sender, EventArgs args)`
	`454`	`+ void OnCompletionListSelectedValueChanged(object sender, EventArgs args)`
`462`	`455`	`{`
`463`	`456`	`var list = Reflector.CompletionList.CompletionList;`
`464`	`457`	`list.SelectedValueChanged -= OnCompletionListSelectedValueChanged;`
`@@ -517,7 +510,7 @@ static void OnHaxeContextFallbackNeeded(bool notSupported)`
`517`	`510`	`completionModeHandler = new CompilerCompletionHandler(CreateHaxeProcess(string.Empty));`
`518`	`511`	`}`
`519`	`512`
`520`		`- static void OnFunctionTypeResult(HaxeComplete hc, HaxeCompleteResult result, HaxeCompleteStatus status)`
	`513`	`+ void OnFunctionTypeResult(HaxeComplete hc, HaxeCompleteResult result, HaxeCompleteStatus status)`
`521`	`514`	`{`
`522`	`515`	`switch (status)`
`523`	`516`	`{`
`@@ -549,7 +542,7 @@ static void OnFunctionTypeResult(HaxeComplete hc, HaxeCompleteResult result, Hax`
`549`	`542`	`#endregion`
`550`	`543`	`}`
`551`	`544`
`552`		`- class PostfixCompletionItem : ICompletionListItem`
	`545`	`+ internal class PostfixCompletionItem : ICompletionListItem`
`553`	`546`	`{`
`554`	`547`	`readonly string template;`
`555`	`548`	`readonly ASResult expr;`
`@@ -561,12 +554,12 @@ public PostfixCompletionItem(string label, string template, ASResult expr)`
`561`	`554`	`this.expr = expr;`
`562`	`555`	`}`
`563`	`556`
`564`		`- public string Label { get; set; }`
	`557`	`+ public string Label { get; }`
`565`	`558`
`566`	`559`	`string pattern;`
`567`	`560`	`public virtual string Pattern`
`568`	`561`	`{`
`569`		`- get { return pattern ?? TemplateUtils.PATTERN_MEMBER; }`
	`562`	`+ get { return pattern ?? TemplateUtils.PatternMember; }`
`570`	`563`	`set { pattern = value; }`
`571`	`564`	`}`
`572`	`565`
`@@ -587,15 +580,9 @@ public Bitmap Icon`
`587`	`580`	`}`
`588`	`581`
`589`	`582`	`string description;`
`590`		`- public string Description`
`591`		`- {`
`592`		`- get`
`593`		`- {`
`594`		`- return description ?? (description = TemplateUtils.GetDescription(expr, template, Pattern));`
`595`		`- }`
`596`		`- }`
	`583`	`+ public string Description => description ?? (description = TemplateUtils.GetDescription(expr, template, Pattern));`
`597`	`584`
`598`		`- public new string ToString() { return Description; }`
	`585`	`+ public new string ToString() => Description;`
`599`	`586`
`600`	`587`	`/// <summary>`
`601`	`588`	`/// Determines whether the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>.`
`@@ -618,9 +605,6 @@ public override bool Equals(object obj)`
`618`	`605`	`/// A hash code for the current <see cref="T:System.Object"/>.`
`619`	`606`	`/// </returns>`
`620`	`607`	`/// <filterpriority>2</filterpriority>`
`621`		`- public override int GetHashCode()`
`622`		`- {`
`623`		`- return Label.GetHashCode() ^ expr.GetHashCode();`
`624`		`- }`
	`608`	`+ public override int GetHashCode() => Label.GetHashCode() ^ expr.GetHashCode();`
`625`	`609`	`}`
`626`	`610`	`}`