Context Navigation

Changeset 11816

Timestamp:

01/21/15 18:59:34 (9 years ago)

Author:

jkarder

Message:

#2077:

Location:

trunk/sources/HeuristicLab.CodeEditor/3.4

Files:

r11804	r11816
156	156	<Compile Include="LanguageFeatures\CodeCompletion\CSharp\CSharpCodeCompletionContext.cs" />
157	157	<Compile Include="LanguageFeatures\CodeCompletion\CSharp\CSharpCodeCompletionDataFactory.cs" />
158		<Compile Include="LanguageFeatures\~~CodeCompletion\CSharp\CSharpCodeCompletion~~Helpers.cs" />
	158	<Compile Include="LanguageFeatures\Helpers\CSharpParsingHelpers.cs" />
159	159	<Compile Include="LanguageFeatures\CodeCompletion\CSharp\CompletionData\EntityCompletionData.cs" />
160	160	<Compile Include="LanguageFeatures\CodeCompletion\CSharp\CompletionData\ImportCompletionData.cs" />

r11800	r11816
46	46	this.offset = offset;
47	47
48		var unresolvedFile = CSharp~~CodeCompletion~~Helpers.CreateCSharpUnresolvedFile(this.document);
	48	var unresolvedFile = CSharpParsingHelpers.CreateCSharpUnresolvedFile(this.document);
49	49	this.projectContent = projectContent.AddOrUpdateFiles(unresolvedFile);
50	50

-                      r11802
+                      r11816
         completionContext.ProjectContent,
         completionContext.TypeResolveContextAtCaret
       ) { EolMarker = Environment.NewLine };
+        );
       char completionChar = completionContext.Document.GetCharAt(completionContext.Offset - 1);
 …
       );
       var unresolvedFile = CSharpCodeCompletionHelpers.CreateCSharpUnresolvedFile(document);
+      var unresolvedFile = CSharpParsingHelpers.CreateCSharpUnresolvedFile(document);
       projectContent = projectContent.AddOrUpdateFiles(unresolvedFile);
+    }

-                      r11700
+                      r11816
 namespace HeuristicLab.CodeEditor {
   internal class CSharpCodeFoldingContext {
+    public readonly IDocument Document;
+    public readonly SyntaxTree SyntaxTree;
+    private readonly IDocument document;
+    public IDocument Document { get { return document; } }
+    private readonly SyntaxTree syntaxTree;
+    public SyntaxTree SyntaxTree { get { return syntaxTree; } }
     public CSharpCodeFoldingContext(IDocument document) {
+      Document = new ReadOnlyDocument(document, document.FileName);
+      var parser = new CSharpParser();
+      var syntaxTree = parser.Parse(document, document.FileName);
+      syntaxTree.Freeze();
+      SyntaxTree = syntaxTree;
+      this.document = new ReadOnlyDocument(document, document.FileName);
+      syntaxTree = CSharpParsingHelpers.CreateSyntaxTree(this.document);
+    }
+  }

-                      r11813
+                      r11816
 namespace HeuristicLab.CodeEditor {
   internal class CSharpCodeCompletionHelpers {
     public static CSharpUnresolvedFile CreateCSharpUnresolvedFile(IDocument document) {
+  internal class CSharpParsingHelpers {
+    public static SyntaxTree CreateSyntaxTree(IDocument document) {
       var parser = new CSharpParser();
       var syntaxTree = parser.Parse(document, document.FileName);
+      return syntaxTree;
+    }
+    public static CSharpUnresolvedFile CreateCSharpUnresolvedFile(IDocument document) {
+      var syntaxTree = CreateSyntaxTree(document);
       syntaxTree.Freeze();
+      return syntaxTree.ToTypeSystem();
+      var unresolvedFile = syntaxTree.ToTypeSystem();
+      return unresolvedFile;
+    }
+  }

Note: See TracChangeset for help on using the changeset viewer.