- Added auto-reevaluating watch values on debug step advance

Author: oleg-shilo

src/CSScriptIntellisense/CSharpIntellisense/CSScriptLibrary.dll

@@ -883,6 +883,8 @@ static void ShowSuggestionList(bool snippetsOnly, bool memberInfoWasShowing = fa
         {
             IEnumerable<ICompletionData> items;
 
+            bool cssSugesstion = false;
+
             if (snippetsOnly)
             {
                 items = GetSnippetsItems();
@@ -894,7 +896,7 @@ static void ShowSuggestionList(bool snippetsOnly, bool memberInfoWasShowing = fa
                 bool namespaceSuggestion = items.All(x => x.CompletionType == CompletionType._namespace);
 
                 Point point;
-                document.GetWordAtCursor(out point);
+                var word = document.GetWordAtCursor(out point);
                 int wordStartPos = point.X;
 
                 string textOnLeft = document.TextBeforePosition(wordStartPos, 300);
@@ -904,7 +906,14 @@ static void ShowSuggestionList(bool snippetsOnly, bool memberInfoWasShowing = fa
 
                 if (!memberSugesstion && !namespaceSuggestion && !assignmentSugesstion)
                 {
-                    bool cssSugesstion = textOnLeft.Split('\n').Last().TrimStart().StartsWith("//css_");
+                    cssSugesstion = textOnLeft.Split('\n').Last().TrimStart().StartsWith("//css_");
+
+                    if (!cssSugesstion)
+                    {
+                        if (textOnLeft == "//" && word.StartsWith("css_"))
+                            cssSugesstion = true;
+                    }
+
                     if (!cssSugesstion)
                     {
                         bool usingSuggestion = document.GetCurrentLine().Trim() == "using";
@@ -973,7 +982,11 @@ static void OnAutocompletionAccepted(ICompletionData data, bool snippetsOnlyMode
 
                 if (word != "")  // e.g. Console.Wr| but not Console.|
                 {
-                    document.SetSelection(p.X, p.Y);
+                    string textOnLeft = document.TextBeforePosition(p.X, 300);
+                    if (textOnLeft.EndsWith("//") && word.StartsWith("css_"))
+                        document.SetSelection(p.X - 2, p.Y);
+                    else
+                        document.SetSelection(p.X, p.Y);
                 }
                 else
                 {

src/CSScriptIntellisense/CSharpIntellisense/CSScriptLibrary.xml

@@ -134,18 +134,20 @@ static string NppScriptsDir
             }
         }
 
-        static public void Build(string scriptFile)
+        static public string Build(string scriptFile, Action<string> onCompilerOutput)
         {
             string compilerOutput;
-            bool success = Build(scriptFile, out compilerOutput);
+            bool success = Build(scriptFile, out compilerOutput, onCompilerOutput);
             if (!success)
                 throw new ApplicationException(compilerOutput.RemoveNonUserCompilingInfo());
+
+            return compilerOutput;
         }
 
         static public string[] GetCodeCompileOutput(string scriptFile)
         {
             string compilerOutput;
-            bool success = Build(scriptFile, out compilerOutput);
+            bool success = Build(scriptFile, out compilerOutput, null);
             if (!success)
                 return compilerOutput.RemoveNonUserCompilingInfo().Split('\n');
             else
@@ -288,7 +290,7 @@ internal static string cscs_v35_exe
             }
         }
 
-        static bool Build(string scriptFile, out string compilerOutput)
+        static bool Build(string scriptFile, out string compilerOutput, Action<string> onCompilerOutput)
         {
             string oldNotificationMessage = null;
             try
@@ -309,10 +311,16 @@ static bool Build(string scriptFile, out string compilerOutput)
                 var output = new StringBuilder();
 
                 bool error = false;
+                bool printOutput = false;
                 string line = null;
                 while (null != (line = p.StandardOutput.ReadLine()))
                 {
-                    if (line.Contains("NuGet") && NotifyClient != null)
+                    printOutput = printOutput || line.Contains("NuGet");
+
+                    if (printOutput && onCompilerOutput != null)
+                        onCompilerOutput(line);
+
+                    if (line.Contains("NuGet") && NotifyClient != null && !oldNotificationMessage.HasText())
                     {
                         oldNotificationMessage = NotifyClient("Processing NuGet packages...");
                     }

src/CSScriptIntellisense/CSharpIntellisense/Intellisense.Common.dll

@@ -526,6 +526,8 @@ private static void OnInvokeComplete(string notification)
         private static int stepsCount = 0;
         private static bool resumeOnNextBreakPoint = false;
 
+        public static bool readyForEvaluation = false;
+
         private static void HandleNotification(string notification)
         {
             //process=>7924:STARTED
@@ -575,10 +577,13 @@ private static void HandleNotification(string notification)
                         //By default Mdbg always enters break mode at start/attach completed
                         //however we should only resume after mdbg finished the initialization (first break is reported).
                         resumeOnNextBreakPoint = true;
+
+                        readyForEvaluation = true;
                     }
                     else if (message.EndsWith(":ENDED"))
                     {
                         NotifyOnDebugStepChanges();
+                        readyForEvaluation = false;
                     }
                 }
                 else if (message.StartsWith(NppCategory.BreakEntered))
@@ -1155,6 +1160,7 @@ static public void Start(string app, string args, CpuType cpu)
         {
             if (!IsRunning)
             {
+                readyForEvaluation = true; // there will be no "process started" message so do it immediately
                 lastLocation = null;
                 Start(cpu);
 

src/CSScriptIntellisense/Plugin.cs

@@ -204,8 +204,8 @@ static public int DebuggerProcessId
 
         static public event Action OnDebuggerStateChanged; //breakpoint, step advance, process exit
 
-        static protected Action OnBreak; //breakpoint hit
-        static protected Action<string> OnDebuggeeProcessNotification; //debugger process state change
+        static public Action OnBreak; //breakpoint hit
+        static public Action<string> OnDebuggeeProcessNotification; //debugger process state change
 
         /// <summary>
         /// Initializes this instance.

src/CSScriptNpp/CSScriptNpp/CSScriptHelper.cs

@@ -45,14 +45,9 @@ int GetColumnStartOffset(int index)
             if (columnsStartOffset.ContainsKey(index))
                 return columnsStartOffset[index];
             return -1;
-            //int retval = 0;
-
-            //for (int i = 0; i < index; i++)
-            //    retval += listView1.Columns[i].Width;
-
-            //return retval;
         }
 
+
         void listView1_MouseDoubleClick(object sender, MouseEventArgs e)
         {
             focucedItem = listView1.GetItemAt(e.X, e.Y);
@@ -72,6 +67,15 @@ void listView1_MouseDoubleClick(object sender, MouseEventArgs e)
             }
         }
 
+        public DbgObject[] GetItems()
+        {
+            return listView1.Items
+                            .OfType<ListViewItem>()
+                            .Select(x=>x.Tag)
+                            .OfType<DbgObject>()
+                            .ToArray();
+        }
+
         void StartEditing(ListViewItem item, int subItem)
         {
             int spos = 0;