MethodCall Parser

geaz · Sep 25, 2015 · c468a2a · c468a2a
1 parent b7b7290
commit c468a2a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,8 @@
+Version 1.0rc2
+
+- GUI bugfixes
+- Method call parser bugfix
+
 Version 1.0rc
 
 - Created two seperate executes (gui and console)

diff --git a/src/Libraries/SharpDox.Build.NRefactory/Loader/CSharpSolution.cs b/src/Libraries/SharpDox.Build.NRefactory/Loader/CSharpSolution.cs
@@ -53,7 +53,7 @@ public IEnumerable<CSharpFile> AllFiles
 
         public CSharpFile GetFile(string fileName)
         {
-            return AllFiles.First(f => f.FileName == fileName);
+            return AllFiles.FirstOrDefault(f => f.FileName == fileName);
         }
 
         private static bool FileIsSolution(string pathToSolutionFile)

diff --git a/src/Libraries/SharpDox.Build.NRefactory/Parser/MethodCallParser.cs b/src/Libraries/SharpDox.Build.NRefactory/Parser/MethodCallParser.cs
@@ -24,11 +24,14 @@ internal void ParseMethodCalls()
                     {
                         HandleOnItemParseStart(sdMethod.Name);
                         var file = _solution.GetFile(sdType.Region.Filename);
-                        var methodAstNode = file.SyntaxTree.GetNodeContaining(
+                        if(file != null) // TODO Check why file can be null sometimes!
+                        {
+                            var methodAstNode = file.SyntaxTree.GetNodeContaining(
                                                 new TextLocation(sdMethod.Region.BeginLine, sdMethod.Region.BeginColumn),
                                                 new TextLocation(sdMethod.Region.EndLine, sdMethod.Region.EndColumn));
 
-                        methodAstNode.AcceptVisitor(new MethodVisitor(_repository, sdMethod, sdType, file));
+                            methodAstNode.AcceptVisitor(new MethodVisitor(_repository, sdMethod, sdType, file));
+                        }                        
                     }
                 }
             }