Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/main/src
diff options
context:
space:
mode:
authorMichael Hutchinson <mhutchinson@novell.com>2009-10-03 04:37:41 +0400
committerMichael Hutchinson <mhutchinson@novell.com>2009-10-03 04:37:41 +0400
commitca9728d16c033a28db572f18374bebb278437cb2 (patch)
treee9134a6c4eb0c3e271654a860ebd83a1a5e59080 /main/src
parent2841e27632603c9daf339e1c5080b8c0e2d7053f (diff)
* 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
Diffstat (limited to 'main/src')
-rw-r--r--main/src/core/MonoDevelop.Ide/ChangeLog6
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs2
2 files changed, 7 insertions, 1 deletions
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 <mhutchinson@novell.com>
+
+ * 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 <mkrueger@novell.com>
* 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)