Merge pull request #994 from SlavaRa/feature/refactoring_repalce_String_by_ASContext.Context_Features.stringKey

[Refactoring] Replace "String" by ASContext.Context.Features.stringKey

Author: elsassph

External/Plugins/ASCompletion/Completion/ASComplete.cs

@@ -1920,7 +1920,7 @@ static private bool HandleDotCompletion(ScintillaControl Sci, bool autoHide)
                 result = new ASResult();
                 if (expr.Separator == '"')
                 {
-                    tmpClass = ctx.ResolveType("String", null);
+                    tmpClass = ctx.ResolveType(ctx.Features.stringKey, null);
                     result.Type = tmpClass;
                     dotIndex = 1;
                 }
@@ -2513,7 +2513,7 @@ static private ASResult EvalExpression(string expression, ASExpr context, FileMo
             else if (token == "\"") // literal string
             {
                 head = new ASResult();
-                head.Type = ASContext.Context.ResolveType("String", null);
+                head.Type = ASContext.Context.ResolveType(ASContext.Context.Features.stringKey, null);
             }
             else head = EvalVariable(token, context, inFile, inClass); // regular eval
 

External/Plugins/ASCompletion/Completion/ASGenerator.cs

@@ -313,7 +313,7 @@ public static List<ICompletionListItem> ContextualGenerator(ScintillaControl Sci
             if (isNotInterface 
                 && resolve.Member != null
                 && resolve.Type != null
-                && resolve.Type.QualifiedName == "String"
+                && resolve.Type.QualifiedName == ASContext.Context.Features.stringKey
                 && found.inClass != ClassModel.VoidClass)
             {
                 int lineStartPos = Sci.PositionFromLine(Sci.CurrentLine);
@@ -1892,7 +1892,7 @@ public static int GetBodyStart(int lineFrom, int lineTo, ScintillaControl Sci, i
 
         private static void GenerateToString(ClassModel inClass, ScintillaControl Sci, MemberModel member)
         {
-            MemberModel resultMember = new MemberModel("toString", "String", FlagType.Function, Visibility.Public);
+            MemberModel resultMember = new MemberModel("toString", ASContext.Context.Features.stringKey, FlagType.Function, Visibility.Public);
 
             bool isOverride = false;
             inClass.ResolveExtends();
@@ -2261,7 +2261,7 @@ private static List<FunctionParameter> ParseFunctionParameters(ScintillaControl
                         if (isDoubleQuote)
                         {
                             result = new ASResult();
-                            result.Type = ctx.ResolveType("String", null);
+                            result.Type = ctx.ResolveType(ctx.Features.stringKey, null);
                             types.Add(result);
                         }
                     }
@@ -2276,7 +2276,7 @@ private static List<FunctionParameter> ParseFunctionParameters(ScintillaControl
                         if (isSingleQuote)
                         {
                             result = new ASResult();
-                            result.Type = ctx.ResolveType("String", null);
+                            result.Type = ctx.ResolveType(ctx.Features.stringKey, null);
                             types.Add(result);
                         }
                     }
@@ -2967,7 +2967,7 @@ private static StatementReturnType GetStatementReturnType(ScintillaControl Sci,
                 char c = (char)Sci.CharAt(pos);
                 if (c == '"' || c == '\'')
                 {
-                    type = ctx.ResolveType("String", inClass.InFile);
+                    type = ctx.ResolveType(ctx.Features.stringKey, inClass.InFile);
                 }
                 else if (c == '}')
                 {