Changeset 11825 for trunk/sources

Timestamp:

01/26/15 16:33:53 (9 years ago)

Author:

jkarder

Message:

#2077:

• do not offer completion for inaccessible protected members
• fixed go to line logic
• fixed comment in CSharpScriptTemplate

Location:

trunk/sources

Files:

• HeuristicLab.CodeEditor/3.4/CodeEditor.cs (modified) (1 diff)
• HeuristicLab.CodeEditor/3.4/LanguageFeatures/CodeCompletion/CSharp/CSharpCodeCompletionDataFactory.cs (modified) (4 diffs)
• HeuristicLab.Scripting/3.3/Scripts/Templates/CSharpScriptTemplate.cs (modified) (1 diff)

trunk/sources/HeuristicLab.CodeEditor/3.4/CodeEditor.cs

@@ -383 +383 @@
           int offset = line.Offset;
           if (TextUtilities.GetLeadingWhitespace(Doc, line).Length > 0)
-            offset = TextUtilities.GetNextCaretPosition(Doc, offset, LogicalDirection.Forward, CaretPositioningMode.WordStart);
+            offset = TextUtilities.GetNextCaretPosition(Doc, offset, LogicalDirection.Forward, CaretPositioningMode.WordBorder);
           TextEditor.CaretOffset = offset;
         }

trunk/sources/HeuristicLab.CodeEditor/3.4/LanguageFeatures/CodeCompletion/CSharp/CSharpCodeCompletionDataFactory.cs

@@ -25 +25 @@
 using ICSharpCode.AvalonEdit.CodeCompletion;
 using ICSharpCode.NRefactory.Completion;
+using ICSharpCode.NRefactory.CSharp;
 using ICSharpCode.NRefactory.CSharp.Completion;
+using ICSharpCode.NRefactory.CSharp.Resolver;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICompletionData = ICSharpCode.NRefactory.Completion.ICompletionData;
@@ -121 +123 @@
 
     #region IParameterCompletionDataFactory Members
-    public IParameterDataProvider CreateConstructorProvider(int startOffset, IType type, ICSharpCode.NRefactory.CSharp.AstNode thisInitializer) {
-      return CreateMethodDataProvider(startOffset, type.GetConstructors());
+    public IParameterDataProvider CreateConstructorProvider(int startOffset, IType type, AstNode thisInitializer) {
+      return CreateConstructorProvider(startOffset, type);
     }
 
     public IParameterDataProvider CreateConstructorProvider(int startOffset, IType type) {
-      return CreateMethodDataProvider(startOffset, type.GetConstructors());
+      var constructors = FilterMethodsForAccessibility(type, type.GetConstructors());
+      return CreateMethodDataProvider(startOffset, constructors);
     }
 
     public IParameterDataProvider CreateDelegateDataProvider(int startOffset, IType type) {
-      return CreateMethodDataProvider(startOffset, new[] { type.GetDelegateInvokeMethod() });
+      var delegates = FilterMethodsForAccessibility(type, new[] { type.GetDelegateInvokeMethod() });
+      return CreateMethodDataProvider(startOffset, delegates);
     }
 
@@ -138 +142 @@
 
     public IParameterDataProvider CreateMethodDataProvider(int startOffset, IEnumerable<IMethod> methods) {
-      return new CSharpOverloadProvider(context, startOffset, from m in methods where m != null select new CSharpInsightItem(m));
+      return new CSharpOverloadProvider(context, startOffset, methods.Where(x => x != null).Select(x => new CSharpInsightItem(x)));
     }
 
@@ -149 +153 @@
     }
     #endregion
+
+    private IEnumerable<IMethod> FilterMethodsForAccessibility(IType type, IEnumerable<IMethod> methods) {
+      var typeResolveContext = context.TypeResolveContextAtCaret;
+      var lookup = new MemberLookup(typeResolveContext.CurrentTypeDefinition, typeResolveContext.Compilation.MainAssembly);
+      bool protectedAccessAllowed = lookup.IsProtectedAccessAllowed(type);
+      return protectedAccessAllowed ? methods : methods.Where(x => !x.IsProtected);
+    }
   }
 }

trunk/sources/HeuristicLab.Scripting/3.3/Scripts/Templates/CSharpScriptTemplate.cs

@@ -1 +1 @@
 // use 'vars' to access variables in the script's variable store (e.g. vars.x = 5)
-// use 'vars[string]' to access variables via runtime strings (e.g. vars[""x""] = 5)
+// use 'vars[string]' to access variables via runtime strings (e.g. vars["x"] = 5)
 // use 'vars.Contains(string)' to check if a variable exists
 // use 'vars.Clear()' to remove all variables