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/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs')
-rw-r--r--main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs310
1 files changed, 163 insertions, 147 deletions
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs
index 4484afcad9..fe409ae573 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs
@@ -27,16 +27,20 @@ using System;
using MonoDevelop.Ide.Gui.Content;
using MonoDevelop.Components;
using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
using MonoDevelop.Ide.TypeSystem;
using MonoDevelop.Ide.Gui;
using MonoDevelop.Core;
using MonoDevelop.CSharp.Completion;
using System.Linq;
using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp;
using System.Text;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
using MonoDevelop.Projects;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
namespace MonoDevelop.CSharp
{
@@ -44,19 +48,19 @@ namespace MonoDevelop.CSharp
{
public override void Dispose ()
{
+ Editor.CaretPositionChanged -= UpdatePath;
IdeApp.Workspace.FileAddedToProject -= HandleProjectChanged;
IdeApp.Workspace.FileRemovedFromProject -= HandleProjectChanged;
IdeApp.Workspace.WorkspaceItemUnloaded -= HandleWorkspaceItemUnloaded;
- IdeApp.Workspace.WorkspaceItemLoaded -= HandleWorkspaceItemLoaded;;
+ IdeApp.Workspace.WorkspaceItemLoaded -= HandleWorkspaceItemLoaded;
+ IdeApp.Workspace.ItemAddedToSolution -= HandleProjectChanged;
+
- if (caret != null) {
- caret.PositionChanged -= UpdatePath;
- caret = null;
- }
if (ext != null) {
ext.TypeSegmentTreeUpdated -= HandleTypeSegmentTreeUpdated;
ext = null;
}
+
currentPath = null;
lastType = null;
lastMember = null;
@@ -64,12 +68,16 @@ namespace MonoDevelop.CSharp
}
bool isPathSet;
- Mono.TextEditor.Caret caret;
CSharpCompletionTextEditorExtension ext;
List<DotNetProject> ownerProjects = new List<DotNetProject> ();
- public override void Initialize ()
+ public override bool IsValidInContext (DocumentContext context)
+ {
+ return context.GetContent<CSharpCompletionTextEditorExtension> () != null;
+ }
+
+ protected override void Initialize ()
{
CurrentPath = new PathEntry[] { new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = null } };
isPathSet = false;
@@ -79,14 +87,15 @@ namespace MonoDevelop.CSharp
UpdateOwnerProjects ();
UpdatePath (null, null);
});
- caret = Document.Editor.Caret;
- caret.PositionChanged += UpdatePath;
- ext = Document.GetContent<CSharpCompletionTextEditorExtension> ();
+ Editor.CaretPositionChanged += UpdatePath;
+ ext = DocumentContext.GetContent<CSharpCompletionTextEditorExtension> ();
ext.TypeSegmentTreeUpdated += HandleTypeSegmentTreeUpdated;
+
IdeApp.Workspace.FileAddedToProject += HandleProjectChanged;
IdeApp.Workspace.FileRemovedFromProject += HandleProjectChanged;
IdeApp.Workspace.WorkspaceItemUnloaded += HandleWorkspaceItemUnloaded;
- IdeApp.Workspace.WorkspaceItemLoaded += HandleWorkspaceItemLoaded;;
+ IdeApp.Workspace.WorkspaceItemLoaded += HandleWorkspaceItemLoaded;
+ IdeApp.Workspace.ItemAddedToSolution += HandleProjectChanged;
}
void HandleWorkspaceItemLoaded (object sender, WorkspaceItemEventArgs e)
@@ -105,11 +114,11 @@ namespace MonoDevelop.CSharp
}
if (ownerProjects.Count == 0) {
ownerProjects = null;
- Document.AttachToProject (null);
+ DocumentContext.AttachToProject (null);
}
}
- void HandleProjectChanged (object sender, ProjectFileEventArgs e)
+ void HandleProjectChanged (object sender, EventArgs e)
{
UpdateOwnerProjects ();
UpdatePath (null, null);
@@ -122,16 +131,16 @@ namespace MonoDevelop.CSharp
void UpdateOwnerProjects (IEnumerable<DotNetProject> allProjects)
{
- var projects = new HashSet<DotNetProject> (allProjects.Where (p => p.IsFileInProject (Document.FileName)));
+ var projects = new HashSet<DotNetProject> (allProjects.Where (p => p.IsFileInProject (DocumentContext.Name)));
if (ownerProjects == null || !projects.SetEquals (ownerProjects)) {
ownerProjects = projects.OrderBy (p => p.Name).ToList ();
- var dnp = Document.Project as DotNetProject;
+ var dnp = DocumentContext.Project as DotNetProject;
if (ownerProjects.Count > 0 && (dnp == null || !ownerProjects.Contains (dnp))) {
// If the project for the document is not a DotNetProject but there is a project containing this file
// in the current solution, then use that project
- var pp = Document.Project != null ? ownerProjects.FirstOrDefault (p => p.ParentSolution == Document.Project.ParentSolution) : null;
+ var pp = DocumentContext.Project != null ? ownerProjects.FirstOrDefault (p => p.ParentSolution == DocumentContext.Project.ParentSolution) : null;
if (pp != null)
- Document.AttachToProject (pp);
+ DocumentContext.AttachToProject (pp);
}
}
}
@@ -139,8 +148,8 @@ namespace MonoDevelop.CSharp
void UpdateOwnerProjects ()
{
UpdateOwnerProjects (IdeApp.Workspace.GetAllItems<DotNetProject> ());
- if (Document.Project == null && ownerProjects.Count > 0)
- Document.AttachToProject (ownerProjects[0]);
+ if (DocumentContext.Project == null && ownerProjects.Count > 0)
+ DocumentContext.AttachToProject (ownerProjects[0]);
}
#region IPathedDocument implementation
@@ -158,7 +167,7 @@ namespace MonoDevelop.CSharp
{
readonly PathedDocumentTextEditorExtension ext;
object tag;
- List<AstNode> memberList = new List<AstNode> ();
+ List<SyntaxNode> memberList = new List<SyntaxNode> ();
public DataProvider (PathedDocumentTextEditorExtension ext, object tag)
{
@@ -171,17 +180,14 @@ namespace MonoDevelop.CSharp
#region IListDataProvider implementation
- void AddTypeToMemberList (TypeDeclaration type)
+ void AddTypeToMemberList (TypeDeclarationSyntax type)
{
foreach (var member in type.Members) {
- if (member is FieldDeclaration) {
- foreach (var variable in ((FieldDeclaration)member).Variables)
- memberList.Add (variable);
- } else if (member is FixedFieldDeclaration) {
- foreach (var variable in ((FixedFieldDeclaration)member).Variables)
+ if (member is FieldDeclarationSyntax) {
+ foreach (var variable in ((FieldDeclarationSyntax)member).Declaration.Variables)
memberList.Add (variable);
- } else if (member is EventDeclaration) {
- foreach (var variable in ((EventDeclaration)member).Variables)
+ } else if (member is EventFieldDeclarationSyntax) {
+ foreach (var variable in ((EventFieldDeclarationSyntax)member).Declaration.Variables)
memberList.Add (variable);
} else {
memberList.Add (member);
@@ -194,16 +200,16 @@ namespace MonoDevelop.CSharp
memberList.Clear ();
if (tag is SyntaxTree) {
var unit = tag as SyntaxTree;
- memberList.AddRange (unit.GetTypes (true));
- } else if (tag is TypeDeclaration) {
- AddTypeToMemberList ((TypeDeclaration)tag);
- } else if (tag is Accessor) {
- var acc = (Accessor)tag;
- var parent = (EntityDeclaration)acc.Parent;
- memberList.AddRange (parent.Children.OfType<Accessor> ());
- } else if (tag is EntityDeclaration) {
- var entity = (EntityDeclaration)tag;
- var type = entity.Parent as TypeDeclaration;
+ memberList.AddRange (unit.GetRoot ().DescendantNodes ().OfType<TypeDeclarationSyntax> ());
+ } else if (tag is TypeDeclarationSyntax) {
+ AddTypeToMemberList ((TypeDeclarationSyntax)tag);
+ } else if (tag is AccessorDeclarationSyntax) {
+ var acc = (AccessorDeclarationSyntax)tag;
+ var parent = (MemberDeclarationSyntax)acc.Parent;
+ memberList.AddRange (parent.ChildNodes ().OfType<AccessorDeclarationSyntax> ());
+ } else if (tag is MemberDeclarationSyntax) {
+ var entity = (MemberDeclarationSyntax)tag;
+ var type = entity.Parent as TypeDeclarationSyntax;
if (type != null) {
AddTypeToMemberList (type);
}
@@ -217,74 +223,77 @@ namespace MonoDevelop.CSharp
result = GetParameters (x).CompareTo (GetParameters (y));
// partial methods without body should come last
- if (result == 0 && x is MethodDeclaration && y is MethodDeclaration) {
- var mx = x as MethodDeclaration;
- var my = y as MethodDeclaration;
- if (mx.Body.IsNull && !my.Body.IsNull)
+ if (result == 0 && x is MethodDeclarationSyntax && y is MethodDeclarationSyntax) {
+ var mx = x as MethodDeclarationSyntax;
+ var my = y as MethodDeclarationSyntax;
+ if (mx.Body == null && my.Body != null)
return 1;
- if (!mx.Body.IsNull && my.Body.IsNull)
+ if (mx.Body != null && my.Body == null)
return -1;
}
return result;
});
}
- static int GetTypeParameters (AstNode x)
+ static int GetTypeParameters (SyntaxNode x)
{
- return x.GetChildrenByRole (Roles.TypeParameter).Count ();
+ return 0; //x.GetChildrenByRole (Roles.TypeParameter).Count ();
}
- static int GetParameters (AstNode x)
+ static int GetParameters (SyntaxNode x)
{
- return x.GetChildrenByRole (Roles.Parameter).Count ();
+ return 0; // x.GetChildrenByRole (Roles.Parameter).Count ();
}
- string GetName (AstNode node)
+ string GetName (SyntaxNode node)
{
if (tag is SyntaxTree) {
- var type = node as TypeDeclaration;
+ var type = node as TypeDeclarationSyntax;
if (type != null) {
var sb = new StringBuilder ();
- sb.Append (type.Name);
- while (type.Parent is TypeDeclaration) {
- type = type.Parent as TypeDeclaration;
- sb.Insert (0, type.Name + ".");
+ sb.Append (type.Identifier.ToString ());
+ while (type.Parent is TypeDeclarationSyntax) {
+ type = type.Parent as TypeDeclarationSyntax;
+ sb.Insert (0, type.Identifier + ".");
}
return sb.ToString ();
}
- var delegateDecl = node as DelegateDeclaration;
+ var delegateDecl = node as DelegateDeclarationSyntax;
if (delegateDecl != null) {
var sb = new StringBuilder ();
- sb.Append (delegateDecl.Name);
- var parentType = delegateDecl.Parent as TypeDeclaration;
+ sb.Append (delegateDecl.Identifier.ToString ());
+ var parentType = delegateDecl.Parent as TypeDeclarationSyntax;
while (parentType != null) {
- sb.Insert (0, parentType.Name + ".");
- parentType = parentType.Parent as TypeDeclaration;
+ sb.Insert (0, parentType.Identifier + ".");
+ parentType = parentType.Parent as TypeDeclarationSyntax;
}
return sb.ToString ();
}
}
- if (node is Accessor) {
- if (node.Role == PropertyDeclaration.GetterRole)
+ var accessor = node as AccessorDeclarationSyntax;
+ if (accessor != null) {
+ if (accessor.Kind () == SyntaxKind.GetAccessorDeclaration)
return "get";
- if (node.Role == PropertyDeclaration.SetterRole)
+ if (accessor.Kind () == SyntaxKind.SetAccessorDeclaration)
return "set";
- if (node.Role == CustomEventDeclaration.AddAccessorRole)
+ if (accessor.Kind () == SyntaxKind.AddAccessorDeclaration)
return "add";
- if (node.Role == CustomEventDeclaration.RemoveAccessorRole)
+ if (accessor.Kind () == SyntaxKind.RemoveAccessorDeclaration)
return "remove";
return node.ToString ();
}
- if (node is OperatorDeclaration)
+ if (node is OperatorDeclarationSyntax)
return "operator";
- if (node is EntityDeclaration)
- return ((EntityDeclaration)node).Name;
- if (node is FixedVariableInitializer) {
- return ((FixedVariableInitializer)node).Name;
- }
- return ((VariableInitializer)node).Name;
+ if (node is MemberDeclarationSyntax)
+ return ((MemberDeclarationSyntax)node).ToString ();
+// if (node is fixeds) {
+// return ((FixedVariableInitializer)node).Name;
+// }
+ if (node is VariableDeclaratorSyntax)
+ return ((VariableDeclaratorSyntax)node).Identifier.ToString ();
+ return node.ToString ();
}
public string GetMarkup (int n)
@@ -299,7 +308,7 @@ namespace MonoDevelop.CSharp
if (type != null) {
var sb = new StringBuilder ();
sb.Append (ext.GetEntityMarkup (type));
- while (type.Parent is TypeDeclaration) {
+ while (type.Parent is TypeDeclarationSyntax) {
sb.Insert (0, ext.GetEntityMarkup (type.Parent) + ".");
type = type.Parent;
}
@@ -316,10 +325,10 @@ namespace MonoDevelop.CSharp
icon = ext.ownerProjects [n].StockIcon;
} else {
var node = memberList [n];
- if (node is EntityDeclaration) {
- icon = ((EntityDeclaration)node).GetStockIcon ();
+ if (node is MemberDeclarationSyntax) {
+ icon = ((MemberDeclarationSyntax)node).GetStockIcon ();
} else {
- icon = ((EntityDeclaration)node.Parent).GetStockIcon ();
+ icon = node.Parent.GetStockIcon ();
}
}
return ImageService.GetIcon (icon, Gtk.IconSize.Menu);
@@ -336,26 +345,20 @@ namespace MonoDevelop.CSharp
public void ActivateItem (int n)
{
if (tag is DotNetProject) {
- ext.Document.AttachToProject (ext.ownerProjects [n]);
+ ext.DocumentContext.AttachToProject (ext.ownerProjects [n]);
} else {
var node = memberList [n];
- var extEditor = ext.Document.GetContent<IExtensibleTextEditor> ();
+ var extEditor = ext.DocumentContext.GetContent<TextEditor> ();
if (extEditor != null) {
- int line, col;
- if (node is OperatorDeclaration) {
- line = Math.Max (1, ((OperatorDeclaration)node).OperatorToken.StartLocation.Line);
- col = Math.Max (1, ((OperatorDeclaration)node).OperatorToken.StartLocation.Column);
- } else if (node is IndexerDeclaration) {
- line = Math.Max (1, ((IndexerDeclaration)node).ThisToken.StartLocation.Line);
- col = Math.Max (1, ((IndexerDeclaration)node).ThisToken.StartLocation.Column);
- } else if (node is EntityDeclaration && !(node is Accessor)) {
- line = Math.Max (1, ((EntityDeclaration)node).NameToken.StartLocation.Line);
- col = Math.Max (1, ((EntityDeclaration)node).NameToken.StartLocation.Column);
+ int offset;
+ if (node is OperatorDeclarationSyntax) {
+ offset = Math.Max (1, ((OperatorDeclarationSyntax)node).OperatorToken.SpanStart);
+ } else if (node is MemberDeclarationSyntax && !(node is AccessorDeclarationSyntax)) {
+ offset = Math.Max (1, ((MemberDeclarationSyntax)node).SpanStart);
} else {
- line = node.StartLocation.Line;
- col = node.StartLocation.Column;
+ offset = node.SpanStart;
}
- extEditor.SetCaretTo (line, col);
+ extEditor.SetCaretLocation (extEditor.OffsetToLocation (offset), true);
}
}
}
@@ -375,14 +378,17 @@ namespace MonoDevelop.CSharp
class CompilationUnitDataProvider : DropDownBoxListWindow.IListDataProvider
{
- Document Document {
+ TextEditor editor;
+
+ DocumentContext DocumentContext {
get;
set;
}
- public CompilationUnitDataProvider (Document document)
+ public CompilationUnitDataProvider (TextEditor editor, DocumentContext documentContext)
{
- this.Document = document;
+ this.editor = editor;
+ this.DocumentContext = documentContext;
}
#region IListDataProvider implementation
@@ -393,7 +399,7 @@ namespace MonoDevelop.CSharp
public string GetMarkup (int n)
{
- return GLib.Markup.EscapeText (Document.ParsedDocument.UserRegions.ElementAt (n).Name);
+ return GLib.Markup.EscapeText (DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.ElementAt (n).Name);
}
internal static Xwt.Drawing.Image Pixbuf {
@@ -409,22 +415,23 @@ namespace MonoDevelop.CSharp
public object GetTag (int n)
{
- return Document.ParsedDocument.UserRegions.ElementAt (n);
+ return DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.ElementAt (n);
}
public void ActivateItem (int n)
{
- var reg = Document.ParsedDocument.UserRegions.ElementAt (n);
- var extEditor = Document.GetContent<MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor> ();
- if (extEditor != null)
- extEditor.SetCaretTo (Math.Max (1, reg.Region.BeginLine), reg.Region.BeginColumn);
+ var reg = DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.ElementAt (n);
+ var extEditor = editor;
+ if (extEditor != null) {
+ extEditor.SetCaretLocation(Math.Max (1, reg.Region.BeginLine), reg.Region.BeginColumn, true);
+ }
}
public int IconCount {
get {
- if (Document.ParsedDocument == null)
+ if (DocumentContext.ParsedDocument == null)
return 0;
- return Document.ParsedDocument.UserRegions.Count ();
+ return DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.Count ();
}
}
@@ -438,7 +445,7 @@ namespace MonoDevelop.CSharp
if (path == null || index < 0 || index >= path.Length)
return null;
var tag = path [index].Tag;
- var window = new DropDownBoxListWindow (tag == null ? (DropDownBoxListWindow.IListDataProvider)new CompilationUnitDataProvider (Document) : new DataProvider (this, tag));
+ var window = new DropDownBoxListWindow (tag == null ? (DropDownBoxListWindow.IListDataProvider)new CompilationUnitDataProvider (Editor, DocumentContext) : new DataProvider (this, tag));
window.FixedRowHeight = 22;
window.MaxVisibleRows = 14;
window.SelectItem (path [index].Tag);
@@ -457,12 +464,19 @@ namespace MonoDevelop.CSharp
}
}
- static PathEntry GetRegionEntry (ParsedDocument unit, Mono.TextEditor.DocumentLocation loc)
+ static PathEntry GetRegionEntry (ParsedDocument unit, DocumentLocation loc)
{
PathEntry entry;
- if (!unit.UserRegions.Any ())
+ FoldingRegion reg;
+ try {
+ if (unit == null || !unit.GetUserRegionsAsync ().Result.Any ())
+ return null;
+ reg = unit.GetUserRegionsAsync ().Result.LastOrDefault (r => r.Region.Contains (loc));
+ } catch (AggregateException) {
return null;
- var reg = unit.UserRegions.LastOrDefault (r => r.Region.IsInside (loc));
+ } catch (OperationCanceledException) {
+ return null;
+ }
if (reg == null) {
entry = new PathEntry (GettextCatalog.GetString ("No region"));
} else {
@@ -480,59 +494,57 @@ namespace MonoDevelop.CSharp
OnPathChanged (new DocumentPathChangedEventArgs (prev));
}
- EntityDeclaration lastType;
+ SyntaxNode lastType;
string lastTypeMarkup;
- EntityDeclaration lastMember;
+ SyntaxNode lastMember;
string lastMemberMarkup;
MonoDevelop.Projects.Project lastProject;
AstAmbience amb;
- string GetEntityMarkup (AstNode node)
+ string GetEntityMarkup (SyntaxNode node)
{
- if (amb == null)
+ if (amb == null || node == null)
return "";
return amb.GetEntityMarkup (node);
}
- void UpdatePath (object sender, Mono.TextEditor.DocumentLocationEventArgs e)
+
+ void UpdatePath (object sender, EventArgs e)
{
- var parsedDocument = Document.ParsedDocument;
- if (parsedDocument == null || parsedDocument.ParsedFile == null)
+ var parsedDocument = DocumentContext.ParsedDocument;
+ if (parsedDocument == null)
return;
- amb = new AstAmbience (document.GetFormattingOptions ());
+ var caretOffset = Editor.CaretOffset;
+ var model = parsedDocument.GetAst<SemanticModel> ();
+ if (model == null)
+ return;
+ var unit = model.SyntaxTree;
+ amb = new AstAmbience (TypeSystemService.Workspace.Options);
- var unit = parsedDocument.GetAst<SyntaxTree> ();
- if (unit == null)
+ var loc = Editor.CaretLocation;
+// var compExt = Editor.GetContent<CSharpCompletionTextEditorExtension> ();
+
+ var root = unit.GetRoot ();
+ SyntaxNode token;
+ try {
+ token = root.FindNode (TextSpan.FromBounds (caretOffset, caretOffset));
+ } catch (Exception) {
return;
-
- var loc = Document.Editor.Caret.Location;
- var compExt = Document.GetContent<CSharpCompletionTextEditorExtension> ();
- var caretOffset = Document.Editor.Caret.Offset;
- var segType = compExt.GetTypeAt (caretOffset);
- if (segType != null)
- loc = segType.Region.Begin;
-
- var curType = (EntityDeclaration)unit.GetNodeAt (loc, n => n is TypeDeclaration || n is DelegateDeclaration);
-
- var curProject = ownerProjects != null && ownerProjects.Count > 1 ? Document.Project : null;
-
- var segMember = compExt.GetMemberAt (caretOffset);
- if (segMember != null) {
- loc = segMember.Region.Begin;
- } else {
- loc = Document.Editor.Caret.Location;
}
+ var curMember = token.AncestorsAndSelf ().FirstOrDefault (m => m is MemberDeclarationSyntax && !(m is NamespaceDeclarationSyntax));
+ var curType = token.AncestorsAndSelf ().FirstOrDefault (m => m is TypeDeclarationSyntax || m is DelegateDeclarationSyntax);
- var curMember = unit.GetNodeAt<EntityDeclaration> (loc);
- if (curType == curMember || curType is DelegateDeclaration)
+ var curProject = ownerProjects != null && ownerProjects.Count > 1 ? DocumentContext.Project : null;
+
+ if (curType == curMember || curType is DelegateDeclarationSyntax)
curMember = null;
if (isPathSet && curType == lastType && curMember == lastMember && curProject == lastProject)
return;
var curTypeMakeup = GetEntityMarkup (curType);
var curMemberMarkup = GetEntityMarkup (curMember);
- if (isPathSet && curType != null && lastType != null && curType.StartLocation == lastType.StartLocation && curTypeMakeup == lastTypeMarkup &&
- curMember != null && lastMember != null && curMember.StartLocation == lastMember.StartLocation && curMemberMarkup == lastMemberMarkup && curProject == lastProject)
+ if (isPathSet && curType != null && lastType != null && curTypeMakeup == lastTypeMarkup &&
+ curMember != null && lastMember != null && curMemberMarkup == lastMemberMarkup && curProject == lastProject)
return;
lastType = curType;
@@ -547,13 +559,13 @@ namespace MonoDevelop.CSharp
if (ownerProjects != null && ownerProjects.Count > 1) {
// Current project if there is more than one
- result.Add (new PathEntry (ImageService.GetIcon (Document.Project.StockIcon, Gtk.IconSize.Menu), GLib.Markup.EscapeText (Document.Project.Name)) { Tag = Document.Project });
+ result.Add (new PathEntry (ImageService.GetIcon (DocumentContext.Project.StockIcon, Gtk.IconSize.Menu), GLib.Markup.EscapeText (DocumentContext.Project.Name)) { Tag = DocumentContext.Project });
}
if (curType == null) {
- if (CurrentPath != null && CurrentPath.Length == 1 && CurrentPath [0].Tag is IUnresolvedFile)
+ if (CurrentPath != null && CurrentPath.Length == 1 && CurrentPath [0].Tag is CSharpSyntaxTree)
return;
- if (CurrentPath != null && CurrentPath.Length == 2 && CurrentPath [1].Tag is IUnresolvedFile)
+ if (CurrentPath != null && CurrentPath.Length == 2 && CurrentPath [1].Tag is CSharpSyntaxTree)
return;
var prevPath = CurrentPath;
result.Add (new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = unit });
@@ -566,29 +578,33 @@ namespace MonoDevelop.CSharp
var type = curType;
var pos = result.Count;
while (type != null) {
- var declaringType = type.Parent as TypeDeclaration;
- result.Insert (pos, new PathEntry (ImageService.GetIcon (type.GetStockIcon (), Gtk.IconSize.Menu), GetEntityMarkup (type)) { Tag = (AstNode)declaringType ?? unit });
- type = declaringType;
+ if (!(type is TypeDeclarationSyntax))
+ break;
+ result.Insert (pos, new PathEntry (ImageService.GetIcon (type.GetStockIcon (), Gtk.IconSize.Menu), GetEntityMarkup (type)) { Tag = (object)type ?? unit });
+ type = type.Parent;
}
}
if (curMember != null) {
result.Add (new PathEntry (ImageService.GetIcon (curMember.GetStockIcon (), Gtk.IconSize.Menu), curMemberMarkup) { Tag = curMember });
- if (curMember is Accessor) {
- var parent = curMember.Parent as EntityDeclaration;
+ if (curMember.Kind () == SyntaxKind.GetAccessorDeclaration ||
+ curMember.Kind () == SyntaxKind.SetAccessorDeclaration ||
+ curMember.Kind () == SyntaxKind.AddAccessorDeclaration ||
+ curMember.Kind () == SyntaxKind.RemoveAccessorDeclaration) {
+ var parent = curMember.Parent;
if (parent != null)
result.Insert (result.Count - 1, new PathEntry (ImageService.GetIcon (parent.GetStockIcon (), Gtk.IconSize.Menu), GetEntityMarkup (parent)) { Tag = parent });
}
}
- var entry = GetRegionEntry (parsedDocument, loc);
+ var entry = GetRegionEntry (DocumentContext.ParsedDocument, loc);
if (entry != null)
result.Add (entry);
PathEntry noSelection = null;
if (curType == null) {
noSelection = new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = unit };
- } else if (curMember == null && !(curType is DelegateDeclaration)) {
+ } else if (curMember == null && !(curType is DelegateDeclarationSyntax)) {
noSelection = new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = curType };
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 11:09:45 +0300