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
diff options
context:
space:
mode:
authorMike Krüger <mkrueger@xamarin.com>2011-11-07 17:24:55 +0400
committerMike Krüger <mkrueger@xamarin.com>2011-11-07 17:24:55 +0400
commit07d5817478993f793fd9498b357d4f117659cf60 (patch)
tree2f8dc6dd26de2b70cd67db21727aa53d06b9ab3d /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog
parent50edb8a59d8f3f90c145fbceaef7f0c5ddba171f (diff)
[Ide] Navigate to search result: Added check for valid compilation
unit.
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog')
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog/NavigateToDialog.cs6
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog/SearchResult.cs5
2 files changed, 8 insertions, 3 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog/NavigateToDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog/NavigateToDialog.cs
index ac9a2ab004..083afcfbd0 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog/NavigateToDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog/NavigateToDialog.cs
@@ -234,8 +234,10 @@ namespace MonoDevelop.Ide.NavigateToDialog
locations.Clear ();
if (list.SelectedRows.Count != 0) {
foreach (int sel in list.SelectedRows) {
- SearchResult res = lastResult.results [sel];
- OpenLocation loc = new OpenLocation (res.File, res.Row, res.Column);
+ var res = lastResult.results [sel];
+ if (res.File == null)
+ continue;
+ var loc = new OpenLocation (res.File, res.Row, res.Column);
if (loc.Line == -1) {
int i = matchEntry.Query.LastIndexOf (':');
if (i != -1) {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog/SearchResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog/SearchResult.cs
index a5511bead0..f6fd95ba7e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog/SearchResult.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog/SearchResult.cs
@@ -96,7 +96,10 @@ namespace MonoDevelop.Ide.NavigateToDialog
class TypeSearchResult : MemberSearchResult
{
public override string File {
- get { return ((IType)member).CompilationUnit.FileName; }
+ get {
+ var cu = ((IType)member).CompilationUnit;
+ return cu != null ? cu.FileName : null;
+ }
}
public override string Description {