Merge pull request #1030 from fdorg/fix/960

When looking up keywords, verify they have spaces around

Author: elsassph

External/Plugins/ASCompletion/ASCompletion.csproj

@@ -77,6 +77,7 @@
     <Compile Include="Completion\ArgumentsProcessor.cs" />
     <Compile Include="Completion\ASComplete.cs" />
     <Compile Include="Completion\ASGenerator.cs" />
+    <Compile Include="Completion\CodeUtils.cs" />
     <Compile Include="Completion\Reformater.cs" />
     <Compile Include="Completion\TemplateUtils.cs" />
     <Compile Include="Context\ASContext.cs" />

External/Plugins/ASCompletion/Completion/ASComplete.cs

@@ -1229,13 +1229,13 @@ static private bool HandleDeclarationCompletion(ScintillaControl Sci, string tai
             while (tempLine > 0)
             {
                 tempText = Sci.GetLine(tempLine).Trim();
-                if (insideClass && IsTypeDecl(tempText, features.typesKeywords))
+                if (insideClass && CodeUtils.IsTypeDecl(tempText, features.typesKeywords))
                 {
                     tempIndent = Sci.GetLineIndentation(tempLine);
                     tab = tempIndent + Sci.TabWidth;
                     break;
                 }
-                if (tempText.Length > 0 && (tempText.EndsWith("}") || IsDeclaration(tempText, features)))
+                if (tempText.Length > 0 && (tempText.EndsWith("}") || CodeUtils.IsDeclaration(tempText, features)))
                 {
                     tempIndent = Sci.GetLineIndentation(tempLine);
                     tab = tempIndent;
@@ -1260,22 +1260,6 @@ static private bool HandleDeclarationCompletion(ScintillaControl Sci, string tai
             return true;
         }
 
-        private static bool IsTypeDecl(string line, string[] typesKeywords)
-        {
-            foreach (string keyword in typesKeywords)
-                if (line.IndexOf(keyword) >= 0) return true;
-            return false;
-        }
-
-        private static bool IsDeclaration(string line, ContextFeatures features)
-        {
-            foreach (string keyword in features.accessKeywords)
-                if (line.StartsWith(keyword)) return true;
-            foreach (string keyword in features.declKeywords)
-                if (line.StartsWith(keyword)) return true;
-            return false;
-        }
-
         #endregion
 
         #region function_completion

External/Plugins/ASCompletion/Completion/CodeUtils.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ASCompletion.Completion
+{
+    static class CodeUtils
+    {
+        /// <summary>
+        /// Lookup type declaration keywords anywhere in the provided text
+        /// </summary>
+        public static bool IsTypeDecl(string line, string[] typesKeywords)
+        {
+            var max = line.Length - 1;
+            foreach (string keyword in typesKeywords)
+            {
+                var p = line.IndexOf(keyword);
+                if (p >= 0) return IsSpaceAt(line, p - 1) && IsSpaceAt(line, p + keyword.Length);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Look if the provided text starts with any declaration keyword
+        /// </summary>
+        public static bool IsDeclaration(string line, ContextFeatures features)
+        {
+            foreach (string keyword in features.accessKeywords)
+                if (line.StartsWith(keyword) && IsSpaceAt(line, keyword.Length)) return true;
+            foreach (string keyword in features.declKeywords)
+                if (line.StartsWith(keyword) && IsSpaceAt(line, keyword.Length)) return true;
+            return false;
+        }
+
+        /// <summary>
+        /// Look if character after first word of line is whitespace
+        /// </summary>
+        public static bool IsSpaceAt(string line, int index)
+        {
+            if (index < 0 || index >= line.Length) return true;
+            else return line[index] <= 32;
+        }
+    }
+}