Context Navigation

Changeset 11933

Timestamp:

02/06/15 10:34:31 (10 years ago)

Author:

jkarder

Message:

#2077: applied changes suggested by ascheibe in comment:39:ticket:2077

Location:

trunk/sources/HeuristicLab.CodeEditor/3.4

Files:

-                      r11836
+                      r11933
     private AssemblyLoader assemblyLoader;
-    private ILanguageFeatures languageFeatures;
     private TextMarkerService textMarkerService;
 …
       TextEditor.TextArea.TextView.LineTransformers.Add(textMarkerService);
       TextEditor.TextArea.TextView.Services.AddService(typeof(ITextMarkerService), textMarkerService);
       #endregion
 …
       switch (TextEditorSyntaxHighlighting) {
         case "XML":
           languageFeatures = new XmlLanguageFeatures(this);
+          XmlLanguageFeatures.Apply(this);
           break;
         default:
           languageFeatures = new CSharpLanguageFeatures(this);
+          CSharpLanguageFeatures.Apply(this);
           break;
+      }

r11816	r11933
158	158	<Compile Include="LanguageFeatures\Helpers\CSharpParsingHelpers.cs" />
159	159	<Compile Include="LanguageFeatures\CodeCompletion\CSharp\CompletionData\EntityCompletionData.cs" />
160		~~<Compile Include="LanguageFeatures\CodeCompletion\CSharp\CompletionData\ImportCompletionData.cs" />~~
161	160	<Compile Include="LanguageFeatures\CodeCompletion\CSharp\CompletionData\VariableCompletionData.cs" />
162	161	<Compile Include="LanguageFeatures\Interfaces\ICodeFoldingStrategy.cs" />

r11700	r11933
25	25	: base(codeEditor, new CSharpCodeFoldingStrategy(codeEditor), new CSharpCodeCompletionStrategy(codeEditor)) {
26	26	}
	27
	28	public static ILanguageFeatures Apply(CodeEditor codeEditor) {
	29	return new CSharpLanguageFeatures(codeEditor);
	30	}
27	31	}
28	32	}

-                      r11825
+                      r11933
     public ICompletionData CreateImportCompletionData(IType type, bool useFullName, bool addForTypeCreation) {
+      var typeDef = type.GetDefinition();
+      return new ImportCompletionData(typeDef, context.TypeResolveContextAtCaret, useFullName);
+      return null;
+    }

-                      r11819
+                      r11933
     #endregion
     public event PropertyChangedEventHandler PropertyChanged;
     private void OnPropertyChanged(string propertyName) {
       var args = new PropertyChangedEventArgs(propertyName);

r11800	r11933
40	40	}
41	41
42		public virtual void ~~RunBackgroundParser~~() {
	42	public virtual void Initialize() {
43	43	backgroundParser.Start();
44	44	}

-                      r11722
+                      r11933
 using System.Linq;
 using CSharpBinding.Parser;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
 namespace HeuristicLab.CodeEditor {
   internal class CSharpCodeFoldingStrategy : CodeFoldingStrategy {
+    private IProjectContent projectContent = new CSharpProjectContent();
+    public CSharpCodeFoldingStrategy(CodeEditor codeEditor)
+      : base(codeEditor) {
+      codeEditor.InternalAssembliesLoaded += (sender, args) => {
+        projectContent = projectContent.AddAssemblyReferences(args.Value);
+      };
+      codeEditor.InternalAssembliesUnloaded += (sender, args) => {
+        projectContent = projectContent.RemoveAssemblyReferences(args.Value);
+      };
+    }
+    public CSharpCodeFoldingStrategy(CodeEditor codeEditor) : base(codeEditor) { }
     protected override CodeFoldingResult GetCodeFoldingResult(out int firstErrorOffset) {

r11800	r11933
23	23	internal interface ICodeCompletionStrategy {
24	24	void DoCodeCompletion(bool controlSpace);
25		void ~~RunBackgroundParser~~();
	25	void Initialize();
26	26	}
27	27	}

r11800	r11933
63	63
64	64	private void LoadedHandler(object sender, EventArgs e) {
65		codeCompletionStrategy.~~RunBackgroundParser~~();
	65	codeCompletionStrategy.Initialize();
66	66	}
67	67

r11700	r11933
25	25	: base(codeEditor, new XmlCodeFoldingStrategy(codeEditor), null) {
26	26	}
	27
	28	public static ILanguageFeatures Apply(CodeEditor codeEditor) {
	29	return new XmlLanguageFeatures(codeEditor);
	30	}
27	31	}
28	32	}

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