Merge branch 'development' of https://github.com/fdorg/flashdevelop into development

Author: Meychi

External/3rdParty/Scintilla/additional_keywords.patch

@@ -34,22 +34,22 @@ diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
  	WordList ppDefinitions;
  	WordList markerList;
  	struct SymbolValue {
-@@ -589,6 +595,15 @@
- 	case 5:
- 		wordListN = &markerList;
+@@ -587,6 +593,15 @@
+ 		wordListN = &ppDefinitions;
  		break;
-+	case 6:
+ 	case 5:
 +		wordListN = &keywords5;
 +		break;
-+	case 7:
++	case 6:
 +		wordListN = &keywords6;
 +		break;
-+	case 8:
++	case 7:
 +		wordListN = &keywords7;
 +		break;
++	case 8:
+ 		wordListN = &markerList;
+ 		break;
  	}
- 	Sci_Position firstModification = -1;
- 	if (wordListN) {
 @@ -809,6 +824,12 @@
  						sc.ChangeState(SCE_C_WORD2|activitySet);
  					} else if (keywords4.InList(s)) {

External/Plugins/ASCompletion/Completion/ASComplete.cs

@@ -184,7 +184,8 @@ static public bool OnChar(ScintillaControl Sci, int Value, bool autoHide)
                         if (features.hasGenerics && position > 2)
                         {
                             char c0 = (char)Sci.CharAt(position - 2);
-                            if (c0 == '.' /*|| Char.IsLetterOrDigit(c0)*/)
+                            //TODO: We should check if we are actually on a generic type
+                            if ((ASContext.Context.CurrentModel.Version == 3 && c0 == '.') || Char.IsLetterOrDigit(c0))
                                 return HandleColonCompletion(Sci, "", autoHide);
                             return false;
                         }
@@ -2206,6 +2207,7 @@ static private bool HandleColonCompletion(ScintillaControl Sci, string tail, boo
 
         private static ComaExpression GetFunctionContext(ScintillaControl Sci, bool autoHide)
         {
+            ContextFeatures features = ASContext.Context.Features;
             ComaExpression coma = ComaExpression.None;
             int position = Sci.CurrentPos - 1;
             char c = ' ';
@@ -2222,7 +2224,7 @@ private static ComaExpression GetFunctionContext(ScintillaControl Sci, bool auto
             // var declaration
             GetWordLeft(Sci, ref position);
             string keyword = (c == ':') ? GetWordLeft(Sci, ref position) : null;
-            if (keyword == ASContext.Context.Features.varKey || keyword == ASContext.Context.Features.constKey)
+            if (keyword == features.varKey || (features.constKey != null && keyword == features.constKey))
                 coma = ComaExpression.VarDeclaration;
             // function return type
             else if ((char)Sci.CharAt(position) == ')')
@@ -2244,7 +2246,6 @@ private static ComaExpression GetFunctionContext(ScintillaControl Sci, bool auto
                     }
                 }
                 keyword = GetWordLeft(Sci, ref position);
-                ContextFeatures features = ASContext.Context.Features;
                 if (keyword == "" && Sci.CharAt(position) == '>' && features.hasGenerics)
                 {
                     int groupCount = 1;
@@ -2267,6 +2268,9 @@ private static ComaExpression GetFunctionContext(ScintillaControl Sci, bool auto
                     keyword = GetWordLeft(Sci, ref position);
                     if (keyword == features.functionKey || keyword == features.getKey || keyword == features.setKey)
                         coma = ComaExpression.FunctionDeclaration;
+                    else if (ASContext.Context.CurrentModel.haXe && keyword == features.varKey && 
+                        (ASContext.Context.CurrentMember == null || (ASContext.Context.CurrentMember.Flags & FlagType.Function) == 0))
+                        coma = ComaExpression.VarDeclaration;  // Haxe Properties
                 }
             }
             // needs more guessing
@@ -3484,7 +3488,7 @@ static private ASExpr GetExpression(ScintillaControl Sci, int position, bool ign
         /// Find out in what context is a coma-separated expression
         /// </summary>
         /// <returns></returns>
-        private static ComaExpression DisambiguateComa(ScintillaControl Sci, int position, int minPos)
+        internal static ComaExpression DisambiguateComa(ScintillaControl Sci, int position, int minPos)
         {
             ContextFeatures features = ASContext.Context.Features;
             // find block start '(' or '{'
@@ -3531,6 +3535,7 @@ private static ComaExpression DisambiguateComa(ScintillaControl Sci, int positio
                         string word1 = GetWordLeft(Sci, ref position);
                         if (word1 == "" && Sci.CharAt(position) == '>' && features.hasGenerics)
                         {
+                            // Generic function: function generic<K>(arg:K)
                             int groupCount = 1;
                             position--;
                             while (position >= 0 && groupCount > 0)
@@ -3569,7 +3574,17 @@ private static ComaExpression DisambiguateComa(ScintillaControl Sci, int positio
                         if (":,(=".IndexOf(c) >= 0)
                         {
                             string line = Sci.GetLine(Sci.LineFromPosition(position));
+                            //TODO: Very limited check, the case|default could be in a previous line, or it could be something else in the same line
                             if (Regex.IsMatch(line, @"\b(case|default)\b.*:")) break; // case: code block
+                            if (c == ':' && Sci.ConfigurationLanguage == "haxe")
+                            {
+                                // Anonymous structures
+                                ComaExpression coma = DisambiguateComa(Sci, position, minPos);
+                                if (coma == ComaExpression.FunctionDeclaration || coma == ComaExpression.VarDeclaration)
+                                {
+                                    return ComaExpression.VarDeclaration;
+                                }
+                            }
                             return ComaExpression.AnonymousObjectParam;
                         }
                         else if (c != ')' && c != '}' && !Char.IsLetterOrDigit(c)) return ComaExpression.AnonymousObject;
@@ -3580,7 +3595,28 @@ private static ComaExpression DisambiguateComa(ScintillaControl Sci, int positio
                 {
                     braceCount++;
                 }
-                else if (c == '?') return ComaExpression.AnonymousObject;
+                else if (c == '?')
+                {
+                    //TODO: Change to ASContext.Context.CurrentModel
+                    if (Sci.ConfigurationLanguage == "haxe") // Haxe optional fields
+                    {
+                        ComaExpression coma = DisambiguateComa(Sci, position - 1, minPos);
+                        if (coma == ComaExpression.FunctionDeclaration)
+                        {
+                            // Function optional argument
+                            return coma;
+                        }
+                        else if (coma == ComaExpression.VarDeclaration)
+                        {
+                            // Possible anonymous structure optional field. Check we are not in a ternary operator
+                            position--;
+                            string word1 = GetWordLeft(Sci, ref position);
+                            c = (word1.Length > 0) ? word1[word1.Length - 1] : (char) Sci.CharAt(position);
+                            if (c == ',' || c == '{') return coma;
+                        }
+                    }
+                    return ComaExpression.AnonymousObject;
+                }
                 position--;
             }
             return ComaExpression.None;