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:
authorLluis Sanchez Gual <lluis@xamarin.com>2015-04-20 19:07:51 +0300
committerLluis Sanchez Gual <lluis@xamarin.com>2015-04-20 19:07:51 +0300
commit95408b1a41b31b645f3a8c3323ab7d3ca4bff26b (patch)
treef8f137cddcb9a40499d303be95722fd2c6081bce /main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs
parentb70e4e04b4e41b8ec28d7e4b220b401ecf467e7a (diff)
parentde043d330a8bf5855d4d983c804cd36727cb2406 (diff)
Merge remote-tracking branch 'origin/roslyn' into new-project-model
Diffstat (limited to 'main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs')
-rw-r--r--main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs b/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs
index c5088a67b6..4e998fe458 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs
@@ -33,6 +33,7 @@ using MonoDevelop.Ide;
using MonoDevelop.AspNet.WebForms;
using MonoDevelop.AspNet.Projects;
using MonoDevelop.Projects;
+using MonoDevelop.Core.Text;
namespace MonoDevelop.AspNet.WebForms
{
@@ -45,7 +46,7 @@ namespace MonoDevelop.AspNet.WebForms
protected override string GenerateInfo (string filename)
{
try {
- var doc = TypeSystemService.ParseFile (filename, DesktopService.GetMimeTypeForUri (filename), File.ReadAllText (filename)) as WebFormsParsedDocument;
+ var doc = TypeSystemService.ParseFile (null, filename, DesktopService.GetMimeTypeForUri (filename), StringTextSource.ReadFrom (filename)).Result as WebFormsParsedDocument;
if (doc != null && !string.IsNullOrEmpty (doc.Info.InheritedClass))
return doc.Info.InheritedClass;
} catch (Exception ex) {