Merge branch 'release/2.0.0'

slavara · slavara · commit cb2fd9923ad4 · 2020-12-03T15:17:03.000+03:00
diff --git a/PostfixCodeCompletion.Tests/Test Files/generated/as3/AfterGenerateConst_fromUInt.as b/PostfixCodeCompletion.Tests/Test Files/generated/as3/AfterGenerateConst_fromUInt.as
@@ -1,7 +1,7 @@
 ﻿package {
 	public class Main {
 		public function Main() {
-			const number:Number = 1;
+			const intValue:int = 1;
 		}
 	}
 }
diff --git a/PostfixCodeCompletion.Tests/Test Files/generated/as3/AfterGenerateVar_fromUInt.as b/PostfixCodeCompletion.Tests/Test Files/generated/as3/AfterGenerateVar_fromUInt.as
@@ -1,7 +1,7 @@
 ﻿package {
 	public class Main {
 		public function Main() {
-			var number:Number = 1;
+			var intValue:int = 1;
 		}
 	}
 }
diff --git a/PostfixCodeCompletion/Completion/Complete.cs b/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:
diff --git a/PostfixCodeCompletion/Completion/HaxeComplete.cs b/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)
             {
diff --git a/PostfixCodeCompletion/Helpers/ScintillaControlHelper.cs b/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;
 
diff --git a/PostfixCodeCompletion/Helpers/TemplateUtils.cs b/PostfixCodeCompletion/Helpers/TemplateUtils.cs
@@ -41,30 +41,39 @@ internal static class TemplateUtils
             PatternType
         };
         
-        internal static bool GetHasTemplates() => GetHasTemplates(PluginBase.MainForm.CurrentDocument.SciControl.ConfigurationLanguage.ToLower());
+        internal static bool GetHasTemplates()
+            => PluginBase.MainForm.CurrentDocument?.SciControl is { } sci
+               && GetHasTemplates(sci.ConfigurationLanguage.ToLower());
 
         internal static bool GetHasTemplates(string language)
-        {
-            return GetHasTemplates(PathHelper.SnippetDir, language) || Settings.CustomSnippetDirectories.Any(it => GetHasTemplates(it.Path, language));
-        }
+            => GetHasTemplates(PathHelper.SnippetDir, language)
+               || Settings.CustomSnippetDirectories.Any(it => GetHasTemplates(it.Path, language));
 
         static bool GetHasTemplates(string snippetPath, string language)
         {
             snippetPath = GetTemplatesDir(snippetPath, language);
-            return Directory.Exists(snippetPath) && Directory.GetFiles(snippetPath, "*.fds").Length > 0;
+            return Directory.Exists(snippetPath) && Directory.EnumerateFiles(snippetPath, "*.fds").Any();
         }
 
-        static string GetTemplatesDir(string snippetPath) => GetTemplatesDir(snippetPath, PluginBase.MainForm.CurrentDocument.SciControl.ConfigurationLanguage.ToLower());
+        static string GetTemplatesDir(string snippetPath)
+        {
+            return PluginBase.MainForm.CurrentDocument?.SciControl is { } sci
+                ? GetTemplatesDir(snippetPath, sci.ConfigurationLanguage.ToLower())
+                : null;
+        }
 
-        static string GetTemplatesDir(string snippetPath, string language) => Path.Combine(Path.Combine(snippetPath, language), PostfixGenerators);
+        static string GetTemplatesDir(string snippetPath, string language) => Path.Combine(snippetPath, language, PostfixGenerators);
 
         internal static Dictionary<string, string> GetTemplates(string 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));
             paths.RemoveAll(s => !Directory.Exists(s));
+            if (paths.Count == 0) return result;
+            var pattern = Templates.Contains(type)
+                ? string.Format(PatternBlock, type)
+                : string.Format(PatternTBlock, type);
             foreach (var path in paths)
             {
                 foreach (var file in Directory.GetFiles(path, "*.fds"))
@@ -83,11 +92,12 @@ internal static string GetTemplate(string snippet, string[] types)
             var result = string.Empty;
             foreach (var type in types)
             {
-                var r = GetTemplate(snippet, type);
-                if (!string.IsNullOrEmpty(r) && r != result) result = r;
+                var template = GetTemplate(snippet, type);
+                if (!string.IsNullOrEmpty(template) && template != result) result = template;
             }
             return result;
         }
+
         internal static string GetTemplate(string snippet, string type)
         {
             var marker = $"#pcc:{type}";
@@ -105,12 +115,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));
+            var content = reader.ReadToEnd();
+            reader.Close();
             return content;
         }
 
@@ -127,27 +134,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)
@@ -203,7 +207,7 @@ internal static string GetDescription(ASResult expr, string template, string pcc
         {
             var sci = PluginBase.MainForm.CurrentDocument.SciControl;
             var position = ScintillaControlHelper.GetDotLeftStartPosition(sci, sci.CurrentPos - 1);
-            var exprStartPosition = ASGenerator.GetStartOfStatement(sci, sci.CurrentPos, expr);
+            var exprStartPosition = ASGenerator.GetStartOfStatement(expr);
             var lineNum = sci.CurrentLine;
             var line = sci.GetLine(lineNum);
             var snippet = line.Substring(exprStartPosition - sci.PositionFromLine(lineNum), position - exprStartPosition);
@@ -222,7 +226,7 @@ internal static void InsertSnippetText(ASResult expr, string template, string pc
             var position = ScintillaControlHelper.GetDotLeftStartPosition(sci, sci.CurrentPos - 1);
             sci.SetSel(position, sci.CurrentPos);
             sci.ReplaceSel(string.Empty);
-            position = ASGenerator.GetStartOfStatement(sci, sci.CurrentPos, expr);
+            position = ASGenerator.GetStartOfStatement(expr);
             sci.SetSel(position, sci.CurrentPos);
             var snippet = Regex.Replace(template, string.Format(PatternBlock, pccpattern), sci.SelText, RegexOptions.IgnoreCase | RegexOptions.Multiline);
             snippet = ProcessMemberTemplate(snippet, expr);
diff --git a/PostfixCodeCompletion/PluginMain.cs b/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";
 
@@ -97,14 +97,12 @@ void AddEventHandlers()
         {
             EventManager.AddEventHandler(this, EventType.Command);
             EventManager.AddEventHandler(this, EventType.Keys, HandlingPriority.High);
-            UITools.Manager.OnCharAdded += OnCharAdded;
+            UITools.Manager.OnCharAdded += (_, value) => Complete.OnCharAdded(value);
         }
 
         /// <summary>
         /// Saves the plugin settings
         /// </summary>
         void SaveSettings() => ObjectSerializer.Serialize(settingFilename, Settings);
-
-        static void OnCharAdded(ScintillaControl sender, int value) => Complete.OnCharAdded(value);
     }
 }
diff --git a/PostfixCodeCompletion/Settings.cs b/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>();
     }
 }
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Kind of surround templates on steroids baked with code completion.
 
 ## Minimum Requirements
 * [Last release FlashDevelop](http://www.flashdevelop.org/community/viewforum.php?f=11).
-* [Haxe 3.2.1](http://haxe.org/download/) or higher - for Haxe projects
+* [Haxe 3.2.1](http://haxe.org/download/) or higher - for Haxe projects.
 
 ### Installation
 
@@ -64,9 +64,9 @@ Available templates for **AS3**:
 * `$(PCCBoolean)` – логическое
 * `$(PCCNullable)` – единица кода, которая может принимать значение null
 * `$(PCCCollection)` – коллекция элементов, расположенных в памяти непосредственно друг за другом
-* `$(PCCHash)` – ассоциативная коллекция
-* `$(PCCNumber)` – числовое
-* `$(PCCString)` – String
+* `$(PCCHash)` – `Object`|`Dictionary`|etc for as3, `Map`|etc - haxe
+* `$(PCCNumber)` – Numeric
+* `$(PCCString)` – `String`
 * http://www.flashdevelop.org/wikidocs/index.php?title=Arguments
  
 Маркеры можно использовать вместе используя разделитель `|`, например сниппет `if($(PCCBoolean|PCCNullable)$(EntryPoint))` будет работать как для логических так и для любых единиц кода, которые могут принимать значени null.

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package {`
`2`	`2`	`public class Main {`
`3`	`3`	`public function Main() {`
`4`		`- const number:Number = 1;`
	`4`	`+ const intValue:int = 1;`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ public class PCCCompleteFactory`
`22`	`22`	`{`
`23`	`23`	`public IPCCComplete CreateComplete()`
`24`	`24`	`{`
`25`		`- switch (PluginBase.CurrentProject)`
	`25`	`+ return PluginBase.CurrentProject switch`
`26`	`26`	`{`
`27`		`- case AS3Project _: return new PCCASComplete();`
`28`		`- case HaxeProject _: return new PCCHaxeComplete();`
`29`		`- default: return new PCCComplete();`
`30`		`- }`
	`27`	`+ AS3Project _ => new PCCASComplete(),`
	`28`	`+ HaxeProject _ => new PCCHaxeComplete(),`
	`29`	`+ _ => new PCCComplete()`
	`30`	`+ };`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -215,7 +215,7 @@ void OnHaxeCompletionModeChanged()`
`215`	`215`	`if (!(PluginBase.CurrentProject is HaxeProject)) return;`
`216`	`216`	`var settings = (HaXeSettings) ((Context) ASContext.GetLanguageContext("haxe")).Settings;`
`217`	`217`	`var sdk = settings.InstalledSDKs.FirstOrDefault(it => it.Path == PluginBase.CurrentProject.CurrentSDK);`
`218`		`- if (sdk == null \|\| new SemVer(sdk.Version) > "3.2.0") return;`
	`218`	`+ if (sdk == null \|\| new SemVer(sdk.Version) < "3.2.0") return;`
`219`	`219`	`switch (settings.CompletionMode)`
`220`	`220`	`{`
`221`	`221`	`case HaxeCompletionModeEnum.CompletionServer:`
Original file line number	Diff line number	Diff line change
`@@ -153,12 +153,11 @@ static void EscapeMacros(IList<string> args)`
`153`	`153`
`154`	`154`	`int GetDisplayPosition()`
`155`	`155`	`{`
`156`		`- switch (CompilerService)`
	`156`	`+ return CompilerService switch`
`157`	`157`	`{`
`158`		`- case HaxeCompilerService.Type:`
`159`		`- return Expr.Context.Position + 1;`
`160`		`- }`
`161`		`- return Expr.Context.Position;`
	`158`	`+ HaxeCompilerService.Type => Expr.Context.Position + 1,`
	`159`	`+ _ => Expr.Context.Position`
	`160`	`+ };`
`162`	`161`	`}`
`163`	`162`
`164`	`163`	`HaxeCompleteStatus ParseLines(string lines)`
`@@ -168,15 +167,11 @@ HaxeCompleteStatus ParseLines(string lines)`
`168`	`167`	`Errors = lines.Trim();`
`169`	`168`	`return HaxeCompleteStatus.Error;`
`170`	`169`	`}`
`171`		`- try`
	`170`	`+ try`
`172`	`171`	`{`
`173`		`- using (TextReader stream = new StringReader(lines))`
`174`		`- {`
`175`		`- using (var reader = new XmlTextReader(stream))`
`176`		`- {`
`177`		`- return ProcessResponse(reader);`
`178`		`- }`
`179`		`- }`
	`172`	`+ using var stream = new StringReader(lines);`
	`173`	`+ using var reader = new XmlTextReader(stream);`
	`174`	`+ return ProcessResponse(reader);`
`180`	`175`	`}`
`181`	`176`	`catch (Exception ex)`
`182`	`177`	`{`
Original file line number	Diff line number	Diff line change
`@@ -241,12 +241,12 @@ public string Value`
`241`	`241`	`Bitmap icon;`
`242`	`242`	`public Bitmap Icon`
`243`	`243`	`{`
`244`		`- get => icon ?? (icon = (Bitmap)PluginBase.MainForm.FindImage("341"));`
	`244`	`+ get => icon ??= (Bitmap)PluginBase.MainForm.FindImage("341");`
`245`	`245`	`set => icon = value;`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`string description;`
`249`		`- public string Description => description ?? (description = TemplateUtils.GetDescription(expr, template, Pattern));`
	`249`	`+ public string Description => description ??= TemplateUtils.GetDescription(expr, template, Pattern);`
`250`	`250`
`251`	`251`	`public new string ToString() => Description;`
`252`	`252`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class PluginMain : IPlugin`
`19`	`19`
`20`	`20`	`public int Api => 1;`
`21`	`21`
`22`		`- public string Name => "PostfixCodeCompletion";`
	`22`	`+ public string Name => nameof(PostfixCodeCompletion);`
`23`	`23`
`24`	`24`	`public string Guid => "21d9ab3e-93e4-4460-9298-c62f87eed7ba";`
`25`	`25`
`@@ -97,14 +97,12 @@ void AddEventHandlers()`
`97`	`97`	`{`
`98`	`98`	`EventManager.AddEventHandler(this, EventType.Command);`
`99`	`99`	`EventManager.AddEventHandler(this, EventType.Keys, HandlingPriority.High);`
`100`		`- UITools.Manager.OnCharAdded += OnCharAdded;`
	`100`	`+ UITools.Manager.OnCharAdded += (_, value) => Complete.OnCharAdded(value);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/// <summary>`
`104`	`104`	`/// Saves the plugin settings`
`105`	`105`	`/// </summary>`
`106`	`106`	`void SaveSettings() => ObjectSerializer.Serialize(settingFilename, Settings);`
`107`		`-`
`108`		`- static void OnCharAdded(ScintillaControl sender, int value) => Complete.OnCharAdded(value);`
`109`	`107`	`}`
`110`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,17 +17,17 @@ internal class Settings`
`17`	`17`	`[Editor(typeof(ArrayEditor), typeof(UITypeEditor))]`
`18`	`18`	`public Folder[] CustomSnippetDirectories`
`19`	`19`	`{`
`20`		`- get { return customSnippetDirectories ?? (customSnippetDirectories = new Folder[] {}); }`
`21`		`- set { customSnippetDirectories = value; }`
	`20`	`+ get => customSnippetDirectories ??= Array.Empty<Folder>();`
	`21`	`+ set => customSnippetDirectories = value;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`bool disableTypeDeclaration = true;`
`25`	`25`
`26`	`26`	`[Category("Haxe"), DisplayName("Disable type declaration for variables"), DefaultValue(true)]`
`27`	`27`	`public bool DisableTypeDeclaration`
`28`	`28`	`{`
`29`		`- get { return disableTypeDeclaration; }`
`30`		`- set { disableTypeDeclaration = value; }`
	`29`	`+ get => disableTypeDeclaration;`
	`30`	`+ set => disableTypeDeclaration = value;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`[Category("Advanced"), DisplayName("Features of languages")]`
`@@ -46,6 +46,6 @@ internal class LanguageFeatures`
`46`	`46`	`public string Language { get; set; } = string.Empty;`
`47`	`47`
`48`	`48`	`[DisplayName("Numeric types")]`
`49`		`- public string[] Numeric { get; set; } = {};`
	`49`	`+ public string[] Numeric { get; set; } = Array.Empty<string>();`
`50`	`50`	`}`
`51`	`51`	`}`