From ca9728d16c033a28db572f18374bebb278437cb2 Mon Sep 17 00:00:00 2001 From: Michael Hutchinson Date: Sat, 3 Oct 2009 00:37:41 +0000 Subject: * MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs: Fix infinite recursion that hung MD on ctrl-space in XML/HTML/ASP.NET files. svn path=/trunk/monodevelop/; revision=143323 --- main/src/core/MonoDevelop.Ide/ChangeLog | 6 ++++++ .../MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'main/src/core') diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog index da3c259d1d..5ecf050154 100644 --- a/main/src/core/MonoDevelop.Ide/ChangeLog +++ b/main/src/core/MonoDevelop.Ide/ChangeLog @@ -1,3 +1,9 @@ +2009-10-02 Michael Hutchinson + + * MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs: Fix + infinite recursion that hung MD on ctrl-space in + XML/HTML/ASP.NET files. + 2009-10-02 Mike Krüger * MonoDevelop.Ide.Gui/ProjectOperations.cs: Added some strings diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs index aa91e8ac55..3d2b243bc6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs @@ -80,7 +80,7 @@ namespace MonoDevelop.Ide.CodeTemplates public static void AddCompletionDataForFileName (string fileName, CompletionDataList list) { string mimeType = DesktopService.GetMimeTypeForUri (fileName); - AddCompletionDataForFileName (mimeType, list); + AddCompletionDataForMime (mimeType, list); } public static void AddCompletionDataForMime (string mimeType, CompletionDataList list) -- cgit v1.2.3