[Monodevelop-patches-list] r1287 - in trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor: . CodeCompletion

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

Author: tberman
Date: 2004-03-28 18:22:08 -0500 (Sun, 28 Mar 2004)
New Revision: 1287

Modified:
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs
Log:
fix fix fix


Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-03-28 22:42:03 UTC (rev 1286)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-03-28 23:22:08 UTC (rev 1287)
@@ -1,5 +1,10 @@
 2004-03-28  Todd Berman  <tberman at sevenl.net>
 
+	* CodeCompletion/CodeCompletionDataProvider.cs: adding null check,
+	should be the last of the code completion bugs relating to the new code
+
+2004-03-28  Todd Berman  <tberman at sevenl.net>
+
 	* CodeCompletion/CompletionWindow.cs: apply patch from Haakon Nilsen
 	<haakon AT ii.uib.no> to fix completion window on KDE.
 

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs	2004-03-28 22:42:03 UTC (rev 1286)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs	2004-03-28 23:22:08 UTC (rev 1287)
@@ -61,6 +61,7 @@
 			IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IParserService));
 			IExpressionFinder expressionFinder = parserService.GetExpressionFinder(fileName);
 			string expression    = expressionFinder == null ? TextUtilities.GetExpressionBeforeOffset(textArea, insertIter.Offset) : expressionFinder.FindExpression(textArea.Buffer.GetText(textArea.Buffer.StartIter, insertIter, true), insertIter.Offset - 2);
+			if (expression == null) return null;
 			if (charTyped == ' ') {
 				if (expression == "using" || expression.EndsWith(" using") || expression.EndsWith("\tusing")|| expression.EndsWith("\nusing")|| expression.EndsWith("\rusing")) {
 					string[] namespaces = parserService.GetNamespaceList("");