Author: lluis
Date: 2006-08-09 12:07:44 -0400 (Wed, 09 Aug 2006)
New Revision: 63549
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/LanguageItemWindow.cs
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.InsightWindow/IndexerInsightDataProvider.cs
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.InsightWindow/MethodInsightDataProvider.cs
Log:
2006-08-07 Philip Turnbull <[EMAIL PROTECTED]>
* MonoDevelop.SourceEditor.Gui/LanguageItemWindow.cs:
* MonoDevelop.SourceEditor.InsightWindow/MethodInsightDataProvider.cs:
* MonoDevelop.SourceEditor.InsightWindow/IndexerInsightDataProvider.cs:
Track API changes in Ambience.
Modified: trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog 2006-08-09
16:07:09 UTC (rev 63548)
+++ trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog 2006-08-09
16:07:44 UTC (rev 63549)
@@ -1,3 +1,10 @@
+2006-08-07 Philip Turnbull <[EMAIL PROTECTED]>
+
+ * MonoDevelop.SourceEditor.Gui/LanguageItemWindow.cs:
+ * MonoDevelop.SourceEditor.InsightWindow/MethodInsightDataProvider.cs:
+ * MonoDevelop.SourceEditor.InsightWindow/IndexerInsightDataProvider.cs:
+ Track API changes in Ambience.
+
2006-08-07 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.SourceEditor.Gui/SourceEditorView.cs: Ensure that the
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/LanguageItemWindow.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/LanguageItemWindow.cs
2006-08-09 16:07:09 UTC (rev 63548)
+++
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/LanguageItemWindow.cs
2006-08-09 16:07:44 UTC (rev 63549)
@@ -16,25 +16,17 @@
{
public class LanguageItemWindow: Gtk.Window
{
+ static ConversionFlags WindowConversionFlags =
ConversionFlags.StandardConversionFlags | ConversionFlags.IncludePangoMarkup;
+
+ static Ambience ambience =
MonoDevelop.Projects.Services.Ambience.GenericAmbience;
+
public LanguageItemWindow (ILanguageItem item, IParserContext
ctx) : base (WindowType.Popup)
{
string s;
- if (item is IMethod)
- s = PangoAmbience.Convert ((IMethod)item);
- else if (item is IField)
- s = PangoAmbience.Convert ((IField)item);
- else if (item is IProperty)
- s = PangoAmbience.Convert ((IProperty)item);
- else if (item is IIndexer)
- s = PangoAmbience.Convert ((IIndexer)item);
- else if (item is IClass)
- s = PangoAmbience.Convert ((IClass)item);
- else if (item is IEvent)
- s = PangoAmbience.Convert ((IEvent)item);
- else if (item is IParameter) {
+ if (item is IParameter) {
s = "<small><i>" + GettextCatalog.GetString
("Parameter") + "</i></small>\n";
- s += PangoAmbience.Convert ((IParameter)item);
+ s += ambience.Convert ((IParameter)item,
WindowConversionFlags);
}
else if (item is LocalVariable) {
LocalVariable var = (LocalVariable) item;
@@ -42,7 +34,7 @@
} else if (item is Namespace)
s = item.Name;
else
- s = item.Name;
+ s = ambience.Convert (item,
WindowConversionFlags);
string doc = GetDocumentation (item.Documentation).Trim
('\n');
if (doc.Length > 0)
@@ -64,16 +56,6 @@
return true;
}
- static IAmbience PangoAmbience
- {
- get {
- IAmbience asvc =
MonoDevelop.Projects.Services.Ambience.CurrentAmbience;
- asvc.ConversionFlags |=
ConversionFlags.IncludePangoMarkup;
- asvc.ConversionFlags &=
~ConversionFlags.ShowInheritanceList;
- return asvc;
- }
- }
-
public static string GetDocumentation (string doc)
{
System.IO.StringReader reader = new
System.IO.StringReader("<docroot>" + doc + "</docroot>");
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.InsightWindow/IndexerInsightDataProvider.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.InsightWindow/IndexerInsightDataProvider.cs
2006-08-09 16:07:09 UTC (rev 63548)
+++
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.InsightWindow/IndexerInsightDataProvider.cs
2006-08-09 16:07:44 UTC (rev 63549)
@@ -24,7 +24,7 @@
{
public class IndexerInsightDataProvider : IInsightDataProvider
{
- AmbienceService ambienceService =
(AmbienceService)ServiceManager.GetService(typeof(AmbienceService));
+ Ambience ambience = null;
string fileName = null;
SourceEditorView textArea;
@@ -39,9 +39,9 @@
public string GetInsightData(int number)
{
IIndexer method = methods[number];
- IAmbience conv = ambienceService.CurrentAmbience;
- conv.ConversionFlags =
ConversionFlags.StandardConversionFlags;
- return conv.Convert(method);// +
+ return ambience.Convert(method);
+ //IAmbience conv = ambienceService.GenericAmbience;
+ //return conv.Convert(method);// +
//"\n" +
//CodeCompletionData.GetDocumentation(method.Documentation); // new (by G.B.)
}
@@ -62,10 +62,13 @@
int caretColumn = initialIter.LineOffset + 1;
IParserContext parserContext;
- if (project != null)
+ if (project != null) {
parserContext =
IdeApp.ProjectOperations.ParserDatabase.GetProjectParserContext (project);
- else
+ ambience = project.Ambience;
+ } else {
parserContext =
IdeApp.ProjectOperations.ParserDatabase.GetFileParserContext (fileName);
+ ambience =
MonoDevelop.Projects.Services.Ambience.GenericAmbience;
+ }
ResolveResult results = parserContext.Resolve
(methodObject, caretLineNumber, caretColumn, fileName, textArea.Buffer.Text);
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.InsightWindow/MethodInsightDataProvider.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.InsightWindow/MethodInsightDataProvider.cs
2006-08-09 16:07:09 UTC (rev 63548)
+++
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.InsightWindow/MethodInsightDataProvider.cs
2006-08-09 16:07:44 UTC (rev 63549)
@@ -24,7 +24,7 @@
{
public class MethodInsightDataProvider : IInsightDataProvider
{
- AmbienceService ambienceService =
(AmbienceService)ServiceManager.GetService(typeof(AmbienceService));
+ Ambience ambience = null;
string fileName = null;
SourceEditorView textArea = null;
@@ -42,9 +42,9 @@
public string GetInsightData(int number)
{
IMethod method = methods[number];
- IAmbience conv = ambienceService.CurrentAmbience;
- conv.ConversionFlags =
ConversionFlags.StandardConversionFlags;
- return conv.Convert(method);
+ return ambience.Convert(method);
+ //IAmbience conv = ambienceService.GenericAmbience;
+ //return conv.Convert(method);
// "\n" +
//
CodeCompletionData.GetDocumentation(method.Documentation); // new (by G.B.)
}
@@ -88,10 +88,13 @@
}
IParserContext parserContext;
- if (project != null)
+ if (project != null) {
parserContext =
IdeApp.ProjectOperations.ParserDatabase.GetProjectParserContext (project);
- else
+ ambience = project.Ambience;
+ } else {
parserContext =
IdeApp.ProjectOperations.ParserDatabase.GetFileParserContext (fileName);
+ ambience =
MonoDevelop.Projects.Services.Ambience.GenericAmbience;
+ }
ResolveResult results = parserContext.Resolve
(methodObject, caretLineNumber, caretColumn, fileName, text);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
