WIP

Author: slavara

PostfixCodeCompletion/Completion/Complete.cs

@@ -22,12 +22,12 @@ public class PCCCompleteFactory
     {
         public IPCCComplete CreateComplete()
         {
-            switch (PluginBase.CurrentProject)
+            return PluginBase.CurrentProject switch
             {
-                case AS3Project _: return new PCCASComplete();
-                case HaxeProject _: return new PCCHaxeComplete();
-                default: return new PCCComplete();
-            }
+                AS3Project _ => new PCCASComplete(),
+                HaxeProject _ => new PCCHaxeComplete(),
+                _ => new PCCComplete()
+            };
         }
     }
 
@@ -215,7 +215,7 @@ void OnHaxeCompletionModeChanged()
             if (!(PluginBase.CurrentProject is HaxeProject)) return;
             var settings = (HaXeSettings) ((Context) ASContext.GetLanguageContext("haxe")).Settings;
             var sdk = settings.InstalledSDKs.FirstOrDefault(it => it.Path == PluginBase.CurrentProject.CurrentSDK);
-            if (sdk == null || new SemVer(sdk.Version) > "3.2.0") return;
+            if (sdk == null || new SemVer(sdk.Version) < "3.2.0") return;
             switch (settings.CompletionMode)
             {
                 case HaxeCompletionModeEnum.CompletionServer:

PostfixCodeCompletion/Completion/HaxeComplete.cs

@@ -153,12 +153,11 @@ static void EscapeMacros(IList<string> args)
 
         int GetDisplayPosition()
         {
-            switch (CompilerService)
+            return CompilerService switch
             {
-                case HaxeCompilerService.Type:
-                    return Expr.Context.Position + 1;
-            }
-            return Expr.Context.Position;
+                HaxeCompilerService.Type => Expr.Context.Position + 1,
+                _ => Expr.Context.Position
+            };
         }
 
         HaxeCompleteStatus ParseLines(string lines)
@@ -168,15 +167,11 @@ HaxeCompleteStatus ParseLines(string lines)
                 Errors = lines.Trim();
                 return HaxeCompleteStatus.Error;
             }
-            try 
+            try
             {
-                using (TextReader stream = new StringReader(lines))
-                {
-                    using (var reader = new XmlTextReader(stream))
-                    {
-                        return ProcessResponse(reader);
-                    }
-                }
+                using var stream = new StringReader(lines);
+                using var reader = new XmlTextReader(stream);
+                return ProcessResponse(reader);
             }
             catch (Exception ex)
             {

PostfixCodeCompletion/Helpers/ScintillaControlHelper.cs

@@ -241,12 +241,12 @@ public string Value
         Bitmap icon;
         public Bitmap Icon
         {
-            get => icon ?? (icon = (Bitmap)PluginBase.MainForm.FindImage("341"));
+            get => icon ??= (Bitmap)PluginBase.MainForm.FindImage("341");
             set => icon = value;
         }
 
         string description;
-        public string Description => description ?? (description = TemplateUtils.GetDescription(expr, template, Pattern));
+        public string Description => description ??= TemplateUtils.GetDescription(expr, template, Pattern);
 
         public new string ToString() => Description;
 

PostfixCodeCompletion/Helpers/TemplateUtils.cs

@@ -106,11 +106,9 @@ internal static string GetTemplate(string snippet, string type)
         static string GetSnippet(string file)
         {
             string content;
-            using (var reader = new StreamReader(File.OpenRead(file)))
-            {
-                content = reader.ReadToEnd();
-                reader.Close();
-            }
+            using var reader = new StreamReader(File.OpenRead(file));
+            content = reader.ReadToEnd();
+            reader.Close();
             return content;
         }
 
@@ -127,27 +125,24 @@ internal static KeyValuePair<string, string> GetVarNameToQualifiedName(ASResult
             var sci = PluginBase.MainForm.CurrentDocument.SciControl;
             var lineNum = sci.CurrentLine;
             var word = Reflector.ASGenerator.GetStatementReturnType(sci, sci.GetLine(lineNum), sci.PositionFromLine(lineNum))?.Word;
-            var varname = string.Empty;
-            if (member?.Name != null) varname = Reflector.ASGenerator.GuessVarName(member.Name, type);
+            var value = string.Empty;
+            if (member?.Name != null) value = Reflector.ASGenerator.GuessVarName(member.Name, type);
             if (!string.IsNullOrEmpty(word) && char.IsDigit(word[0])) word = null;
             if (!string.IsNullOrEmpty(word) && (string.IsNullOrEmpty(type) || Regex.IsMatch(type, "(<[^]]+>)"))) word = null;
             if (!string.IsNullOrEmpty(type) && type == ASContext.Context.Features.voidKey) type = null;
-            if (string.IsNullOrEmpty(varname)) varname = Reflector.ASGenerator.GuessVarName(word, type);
-            if (!string.IsNullOrEmpty(varname) && varname == word) varname = $"{varname}1";
-            return new KeyValuePair<string, string>(varname, type);
+            if (string.IsNullOrEmpty(value)) value = Reflector.ASGenerator.GuessVarName(word, type);
+            if (!string.IsNullOrEmpty(value) && value == word) value = $"{value}1";
+            return new KeyValuePair<string, string>(value, type);
         }
 
         internal static string ProcessTemplate(string pattern, string template, ASResult expr)
         {
-            switch (pattern)
+            return pattern switch
             {
-                case PatternCollection:
-                    return ProcessCollectionTemplate(template, expr);
-                case PatternHash:
-                    return ProcessHashTemplate(template, expr);
-                default:
-                    return template;
-            }
+                PatternCollection => ProcessCollectionTemplate(template, expr),
+                PatternHash => ProcessHashTemplate(template, expr),
+                _ => template
+            };
         }
 
         internal static string ProcessMemberTemplate(string template, ASResult expr)

PostfixCodeCompletion/PluginMain.cs

@@ -19,7 +19,7 @@ public class PluginMain : IPlugin
 
         public int Api => 1;
 
-        public string Name => "PostfixCodeCompletion";
+        public string Name => nameof(PostfixCodeCompletion);
 
         public string Guid => "21d9ab3e-93e4-4460-9298-c62f87eed7ba";
 

PostfixCodeCompletion/Settings.cs

@@ -17,17 +17,17 @@ internal class Settings
         [Editor(typeof(ArrayEditor), typeof(UITypeEditor))]
         public Folder[] CustomSnippetDirectories
         {
-            get { return customSnippetDirectories ?? (customSnippetDirectories = new Folder[] {}); }
-            set { customSnippetDirectories = value; }
+            get => customSnippetDirectories ??= Array.Empty<Folder>();
+            set => customSnippetDirectories = value;
         }
 
         bool disableTypeDeclaration = true;
 
         [Category("Haxe"), DisplayName("Disable type declaration for variables"), DefaultValue(true)]
         public bool DisableTypeDeclaration
         {
-            get { return disableTypeDeclaration; }
-            set { disableTypeDeclaration = value; }
+            get => disableTypeDeclaration;
+            set => disableTypeDeclaration = value;
         }
 
         [Category("Advanced"), DisplayName("Features of languages")]
@@ -46,6 +46,6 @@ internal class LanguageFeatures
         public string Language { get; set; } = string.Empty;
 
         [DisplayName("Numeric types")]
-        public string[] Numeric { get; set; } = {};
+        public string[] Numeric { get; set; } = Array.Empty<string>();
     }
 }