- Updated syntaxer with full autoclass support

Author: oleg-shilo

src/CSScriptIntellisense/CSharpIntellisense/CSScriptHelper.cs

@@ -240,6 +240,7 @@ static public Tuple<string[], string[]> GetProjectFiles(string script)
         static public bool NeedsAutoclassWrapper(string text)
         {
             return Regex.Matches(text, @"\s?//css_args\s+/ac(,|;|\s+)").Count != 0
+                || Regex.Matches(text, @"\s?//css_autoclass\s+").Count != 0
                 || Regex.Matches(text, @"\s?//css_ac\s+").Count != 0;
         }
 

src/CSScriptIntellisense/CSharpIntellisense/Intellisense.Common.dll

@@ -154,25 +154,29 @@ public static void ResetProject(Tuple<string, string>[] sourceFiles = null, para
         //----------------------------------
         public static CodeMapItem[] GetMapOf(string code, string codeFile)
         {
-            bool injected = CSScriptHelper.DecorateIfRequired(ref code);
             CodeMapItem[] map;
 
             if (Config.Instance.UsingRoslyn)
+            {
                 map = Syntaxer.GetMapOf(code, codeFile);
+            }
             else
+            {
+                bool injected = CSScriptHelper.DecorateIfRequired(ref code);
                 map = MonoEngine.GetMapOf(code, injected, codeFile);
 
-            if (injected)
-            {
-                int injectedLineOffset = CSScriptHelper.GetDecorationInfo(code).Item1;
-                int injectedLineNumber = code.Substring(0, injectedLineOffset).Split('\n').Count();
+                if (injected)
+                {
+                    int injectedLineOffset = CSScriptHelper.GetDecorationInfo(code).Item1;
+                    int injectedLineNumber = code.Substring(0, injectedLineOffset).Split('\n').Count();
 
-                map = map.Where(i => i.Line != injectedLineNumber).ToArray();
+                    map = map.Where(i => i.Line != injectedLineNumber).ToArray();
 
-                foreach (CodeMapItem item in map)
-                {
-                    if (item.Line >= injectedLineNumber)
-                        item.Line -= 1;
+                    foreach (CodeMapItem item in map)
+                    {
+                        if (item.Line >= injectedLineNumber)
+                            item.Line -= 1;
+                    }
                 }
             }
             return map;

src/CSScriptIntellisense/CSharpIntellisense/SimpleCodeCompletion.cs

@@ -82,12 +82,13 @@ void main2(int test, int test2) {}
             Assert.Equal("System.IO", items[1]);
         }
 
-        [Fact]
+        [Fact(Skip = "Reflector is no longer in use")]
+        
         public void AutoClassClass()
         {
             string code =
 @"//css_inc test.cs
-//css_args /ac
+//css_ac
 using System;
 using System.Linq;
 using System.Data;

src/CSScriptNpp.Test/Editor.Tests/CodeMap.cs

@@ -1353,6 +1353,7 @@ public static string RemoveNonUserCompilingInfo(this string compilerOutput)
                                  .Replace("vbc : Command line (0,0): warning BC2007: unrecognized option 'warn:0'; ignored", "");
         }
 
+        
         public static IEnumerable<T> Concat<T>(this IEnumerable<T> collection, T item)
         {
             return collection.Concat(new[] { item });