[Monodevelop-patches-list] r1285 - in trunk/MonoDevelop/src/Main/Base: . Services/ParserService

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-03-28 17:30:55 -0500 (Sun, 28 Mar 2004)
New Revision: 1285

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
Log:
fix bug #56128


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-03-28 22:13:54 UTC (rev 1284)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-03-28 22:30:55 UTC (rev 1285)
@@ -1,3 +1,9 @@
+2004-03-28  Todd Berman  <tberman at sevenl.net>
+
+	* Services/ParserService/DefaultParserService.cs: re-add try catch to
+	prevent exceptions from percolating up and blowing up. closes bug
+	#56128
+
 2004-03-28  John Luke  <jluke at cfl.rr.com>
 
 	* Services/ParserService/DefaultParserService.cs:
@@ -3,4 +9,5 @@
 	if filename == null don't switch on it
 
+>>>>>>> .r1284
 2004-03-27  Todd Berman  <tberman at sevenl.net>
 

Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-03-28 22:13:54 UTC (rev 1284)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-03-28 22:30:55 UTC (rev 1285)
@@ -752,16 +752,16 @@
 		{
 			// added exception handling here to prevent silly parser exceptions from
 			// being thrown and corrupting the textarea control
-			//try {
+			try {
 				IParser parser = GetParser(fileName);
-				Console.WriteLine("Parse info : " + GetParseInformation(fileName).MostRecentCompilationUnit.Tag);
+				//Console.WriteLine("Parse info : " + GetParseInformation(fileName).MostRecentCompilationUnit.Tag);
 				if (parser != null) {
 					return parser.Resolve(this, expression, caretLineNumber, caretColumn, fileName, fileContent);
 				}
 				return null;
-			//} catch {
-//				return null;
-			//}
+			} catch {
+				return null;
+			}
 		}
 
 		protected void OnParseInformationAdded(ParseInformationEventArgs e)