Merge branch 'release/2.0.0'

Author: slavara

PostfixCodeCompletion.Tests/PostfixCodeCompletion.Tests.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PostfixCodeCompletion</RootNamespace>
     <AssemblyName>PostfixCodeCompletion.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -20,6 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>9</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,6 +29,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>9</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>

PostfixCodeCompletion/Completion/Complete.cs

@@ -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).IsOlderThan(new SemVer("3.2.0"))) return;
+            if (sdk == null || new SemVer(sdk.Version) > "3.2.0") return;
             switch (settings.CompletionMode)
             {
                 case HaxeCompletionModeEnum.CompletionServer:

PostfixCodeCompletion/Helpers/Reflector.cs

@@ -3,7 +3,6 @@
 using System.Reflection;
 using ASCompletion.Completion;
 using ASCompletion.Context;
-using ASCompletion.Model;
 using PluginCore;
 using PluginCore.Controls;
 using ScintillaNet;
@@ -68,7 +67,7 @@ internal StatementReturnType GetStatementReturnType(ScintillaControl sci, string
             var currentClass = ASContext.Context.CurrentClass;
             if (currentClass.InFile.Context == null)
             {
-                currentClass = (ClassModel) currentClass.Clone();
+                currentClass = currentClass.Clone();
                 var language = PluginBase.MainForm.SciConfig.GetLanguageFromFile(currentClass.InFile.BasePath);
                 currentClass.InFile.Context = ASContext.GetLanguageContext(language) ?? ASContext.Context;
             }
@@ -79,9 +78,9 @@ internal StatementReturnType GetStatementReturnType(ScintillaControl sci, string
             var type = returnType.GetType();
             var result = new StatementReturnType
             {
-                Resolve = (ASResult) type.GetField("resolve").GetValue(returnType),
-                Position = (int) type.GetField("position").GetValue(returnType),
-                Word = (string) type.GetField("word").GetValue(returnType)
+                Resolve = (ASResult) type.GetField(nameof(StatementReturnType.Resolve)).GetValue(returnType),
+                Position = (int) type.GetField(nameof(StatementReturnType.Position)).GetValue(returnType),
+                Word = (string) type.GetField(nameof(StatementReturnType.Word)).GetValue(returnType)
             };
             return result;
         }

PostfixCodeCompletion/PostfixCodeCompletion.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PostfixCodeCompletion</RootNamespace>
     <AssemblyName>PostfixCodeCompletion</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>9</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>9</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

README.md

@@ -1,4 +1,4 @@
-PostfixCodeCompletion plugin for [FlashDevelop](http://www.flashdevelop.org)/[HaxeDevelop](http://www.haxedevelop.org)
+PostfixCodeCompletion plugin for [FlashDevelop](http://flashdevelop.org)/[HaxeDevelop](https://haxedevelop.org/)
 ========================
 [![Build status](https://ci.appveyor.com/api/projects/status/acnsq3sk2xboe3as?svg=true)](https://ci.appveyor.com/project/slavara/fd-postfix-code-completion-plugin)
 

Snippets/haxe/postfixgenerators/foreach.fds

@@ -3,6 +3,6 @@ for (it in $(PCCCollection|PCCHash)) $(CSLB){
 }
 #pcc:PCCString
 for ($(ItmUniqueVar) in 0...$(PCCString).length) $(CSLB){
-	var char = $(PCCString).charAt($(EntryPoint));
+	var char = $(PCCString).charAt($(ItmUniqueVar));
 	$(EntryPoint)
 }