Changeset 2213Tweet

Timestamp:

Jan 11, 2013, 2:58:49 AM (10 years ago)

Author:

sam

Message:

vslol: fix an infinite recursion triggered by IntelliSense.

Location:

trunk/tools/vslol

Files:

• CppKeywordClassifier.cs (modified) (6 diffs)
• Properties/AssemblyInfo.cs (modified) (3 diffs)
• source.extension.vsixmanifest (modified) (1 diff)

trunk/tools/vslol/CppKeywordClassifier.cs

@@ -2 +2 @@
 // Lol Engine - VsLol add-in for Visual Studio
 //
-// Copyright: (c) 2010-2012 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
 //   This program is free software; you can redistribute it and/or
 //   modify it under the terms of the Do What The Fuck You Want To
@@ -15 +15 @@
 using System.Windows.Media;
 using System.Text.RegularExpressions;
+using System.Diagnostics; /* For debugging purposes */
 
 using Microsoft.VisualStudio.Text;
@@ -60 +61 @@
 {
     private IClassifier m_classifier;
+    private bool m_inprogress;
 
     private IClassificationType m_types_type, m_constant_type, m_normal_type;
@@ -138 +140 @@
     {
         m_classifier = classifier;
+        m_inprogress = false;
 
         m_types_type = registry.GetClassificationType("LolAnyType");
@@ -177 +180 @@
     {
         List<ClassificationSpan> ret = new List<ClassificationSpan>();
+
+        if (m_inprogress)
+        {
+            /* For some reason we can get called recursively when parsing a
+             * string for the IntelliSense drop-down menu. There is information
+             * on how to deal with it properly on the following SO page:
+             * http://stackoverflow.com/q/3155598/111461
+             * The crash can be reproduced by simply typing "vec2(" and waiting
+             * for IntelliSense to spawn the menu. */
+            ret.Add(new ClassificationSpan(span, m_constant_type));
+            return ret;
+        }
+
+        m_inprogress = true;
 
         foreach (ClassificationSpan cs in m_classifier.GetClassificationSpans(span))
@@ -207 +224 @@
         }
 
+        m_inprogress = false;
+
         return ret;
     }

trunk/tools/vslol/Properties/AssemblyInfo.cs

@@ -2 +2 @@
 // Lol Engine - VsLol add-in for Visual Studio
 //
-// Copyright: (c) 2010-2012 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
 //   This program is free software; you can redistribute it and/or
 //   modify it under the terms of the Do What The Fuck You Want To
@@ -18 +18 @@
 [assembly: AssemblyCompany("Lol")]
 [assembly: AssemblyProduct("VsLol")]
-[assembly: AssemblyCopyright("Copyright © Sam Hocevar 2012")]
+[assembly: AssemblyCopyright("Copyright © 2012-2013 Sam Hocevar")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -30 +30 @@
 [assembly: Guid("58968f91-edb8-4a4c-9f4f-ba39fdb4a21a")]
 
-[assembly: AssemblyVersion("1.0.0.7")]
-[assembly: AssemblyFileVersion("1.0.0.7")]
+[assembly: AssemblyVersion("1.0.0.8")]
+[assembly: AssemblyFileVersion("1.0.0.8")]

trunk/tools/vslol/source.extension.vsixmanifest

@@ -4 +4 @@
     <Name>VsLol</Name>
     <Author>Lol</Author>
-    <Version>1.0.0.7</Version>
+    <Version>1.0.0.8</Version>
     <Description xml:space="preserve">Lol Engine Productivity Tools.</Description>
     <Locale>1033</Locale>