diff options
| author | Mike Krüger <mkrueger@novell.com> | 2010-05-11 18:04:02 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@novell.com> | 2010-05-11 18:04:02 +0400 |
| commit | 078e6274ad66845ffcc74a64e5dea0901b77c5c9 (patch) | |
| tree | e04b899b1fbd158c0e4fc5eb5d6aafbe5908af36 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates | |
| parent | 972192c536fb05989eaa23cb2991d271d4fe69ab (diff) | |
| parent | 7c78366dd8744f43f9fed34896c40aa8be4a4a1e (diff) | |
* Makefile.am:
* MonoDevelop.Ide.csproj:
* MonoDevelop.Ide.CodeCompletion/DisplayFlags.cs:
* MonoDevelop.Ide.CodeCompletion/CompletionData.cs:
* MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs:
* MonoDevelop.Ide.CodeCompletion/ICompletionData.cs:
* MonoDevelop.Ide.CodeCompletion/CompletionDataList.cs:
* MonoDevelop.Ide.CodeCompletion/CompletionCategory.cs:
* MonoDevelop.Ide.CodeCompletion/MemberCompletionData.cs:
* MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs:
* MonoDevelop.Ide.CodeCompletion/IMemberCompletionData.cs:
* MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs: Made
the code completion system a more consistent (Removed interfaces,
provided common base class - easier to extend), ActionCompletionData
in conjunction with completion history now works correctly. Custom
CompletionData now has access to the list window as well (Required
for more complex insert actions).
svn path=/trunk/monodevelop/; revision=157118
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs | 8 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs index 7bf87f33b9..315057bc64 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs @@ -37,7 +37,7 @@ namespace MonoDevelop.Ide.CodeTemplates void InsertTemplate (CodeTemplate template, Document document); } - public class CodeTemplateCompletionData : CompletionData, IActionCompletionData + public class CodeTemplateCompletionData : CompletionData { Document doc; CodeTemplate template; @@ -52,10 +52,10 @@ namespace MonoDevelop.Ide.CodeTemplates this.Description = template.Shortcut + Environment.NewLine + GettextCatalog.GetString (template.Description); } - public void InsertCompletionText (ICompletionWidget widget, CodeCompletionContext context) + public override void InsertCompletionText (CompletionListWindow window) { - if (widget is ICodeTemplateWidget) { - ((ICodeTemplateWidget)widget).InsertTemplate (template, doc); + if (window.CompletionWidget is ICodeTemplateWidget) { + ((ICodeTemplateWidget)window.CompletionWidget).InsertTemplate (template, doc); } else { template.InsertTemplate (doc); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs index 48748cb84e..fa2bb6e562 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs @@ -142,7 +142,7 @@ namespace MonoDevelop.Ide.CodeTemplates list = ext.CodeCompletionCommand (CurrentContext.Document.TextEditor.CurrentCodeCompletionContext); foreach (object o in list) { - MonoDevelop.Ide.CodeCompletion.IMemberCompletionData data = o as MonoDevelop.Ide.CodeCompletion.IMemberCompletionData; + MonoDevelop.Ide.CodeCompletion.MemberCompletionData data = o as MonoDevelop.Ide.CodeCompletion.MemberCompletionData; if (data == null) continue; @@ -154,7 +154,7 @@ namespace MonoDevelop.Ide.CodeTemplates } foreach (object o in list) { - MonoDevelop.Ide.CodeCompletion.IMemberCompletionData data = o as MonoDevelop.Ide.CodeCompletion.IMemberCompletionData; + MonoDevelop.Ide.CodeCompletion.MemberCompletionData data = o as MonoDevelop.Ide.CodeCompletion.MemberCompletionData; if (data == null) continue; if (data.Member is IParameter) { @@ -165,7 +165,7 @@ namespace MonoDevelop.Ide.CodeTemplates } foreach (object o in list) { - MonoDevelop.Ide.CodeCompletion.IMemberCompletionData data = o as MonoDevelop.Ide.CodeCompletion.IMemberCompletionData; + MonoDevelop.Ide.CodeCompletion.MemberCompletionData data = o as MonoDevelop.Ide.CodeCompletion.MemberCompletionData; if (data == null) continue; if (data.Member is LocalVariable) { |